Merge branch 'master' of /pub/scm/gpxe
authorMarty Connor <mdc@etherboot.org>
Wed, 4 Jul 2007 22:33:22 +0000 (18:33 -0400)
committerMarty Connor <mdc@etherboot.org>
Wed, 4 Jul 2007 22:33:22 +0000 (18:33 -0400)

Trivial merge