Merge branch 'master' into 3leaf
authorMichael Brown <mcb30@etherboot.org>
Thu, 23 Aug 2007 19:50:58 +0000 (20:50 +0100)
committerMichael Brown <mcb30@etherboot.org>
Thu, 23 Aug 2007 19:50:58 +0000 (20:50 +0100)

Trivial merge