Merge branch 'master' of git+ssh://rom.etherboot.org/scm/people/warthog9/bko into...
authorJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Wed, 9 Sep 2009 20:51:31 +0000 (13:51 -0700)
committerJohn 'Warthog9' Hawley <warthog9@eaglescrag.net>
Wed, 9 Sep 2009 20:51:31 +0000 (13:51 -0700)

Trivial merge