Merge branches 'warthog9' and 'master' of http://etherboot.org/share/warthog9/BKO