Merge branch 'master' into iscsi-update
authorMichael Brown <mcb30@etherboot.org>
Sun, 8 Jul 2007 21:06:33 +0000 (22:06 +0100)
committerMichael Brown <mcb30@etherboot.org>
Sun, 8 Jul 2007 21:06:33 +0000 (22:06 +0100)

Trivial merge