Merge branch 'master' of /pub/scm/gpxe
authorMarty Connor <mdc@etherboot.org>
Tue, 3 Jul 2007 17:20:54 +0000 (13:20 -0400)
committerMarty Connor <mdc@etherboot.org>
Tue, 3 Jul 2007 17:20:54 +0000 (13:20 -0400)

Trivial merge