Merge branch 'master' into 3leaf-delivery
authorMichael Brown <mcb30@etherboot.org>
Fri, 21 Sep 2007 00:27:03 +0000 (01:27 +0100)
committerMichael Brown <mcb30@etherboot.org>
Fri, 21 Sep 2007 00:27:03 +0000 (01:27 +0100)

Trivial merge