Merge branch 'master' of ssh://rom.etherboot.org/pub/scm/gpxe
authorMarty Connor <mdc@etherboot.org>
Mon, 2 Jul 2007 19:36:19 +0000 (15:36 -0400)
committerMarty Connor <mdc@etherboot.org>
Mon, 2 Jul 2007 19:36:19 +0000 (15:36 -0400)

Trivial merge