Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
authorMichael Brown <mcb30@etherboot.org>
Wed, 4 Jul 2007 23:05:36 +0000 (00:05 +0100)
committerMichael Brown <mcb30@etherboot.org>
Wed, 4 Jul 2007 23:05:36 +0000 (00:05 +0100)

Trivial merge