Merge branch 'master' of git://git.etherboot.org/scm/gpxe
authorHolger Lubitz <hal@duncan.ol.sub.de>
Tue, 7 Aug 2007 23:01:09 +0000 (01:01 +0200)
committerHolger Lubitz <hal@duncan.ol.sub.de>
Tue, 7 Aug 2007 23:01:09 +0000 (01:01 +0200)

Trivial merge