Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe
authorMichael Brown <mcb30@etherboot.org>
Sat, 15 Dec 2007 19:37:44 +0000 (19:37 +0000)
committerMichael Brown <mcb30@etherboot.org>
Sat, 15 Dec 2007 19:37:44 +0000 (19:37 +0000)

Trivial merge