Merge branch 'master' of git://git.etherboot.org/scm/people/pravin/BKO
authorJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Thu, 1 Oct 2009 01:02:17 +0000 (18:02 -0700)
committerJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Thu, 1 Oct 2009 01:02:17 +0000 (18:02 -0700)
Conflicts:
Makefile
bko/live/ubuntu/U9/casper
bko/live/ubuntu/ubuntu.bko.tmpl

Conflicts resolved.


Trivial merge