Merge branch 'master' into 3leaf
authorMichael Brown <mcb30@etherboot.org>
Tue, 21 Aug 2007 00:53:11 +0000 (01:53 +0100)
committerMichael Brown <mcb30@etherboot.org>
Tue, 21 Aug 2007 00:53:11 +0000 (01:53 +0100)

Trivial merge