Merge branch 'master' of git://git.etherboot.org/scm/gpxe
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Tue, 9 Jun 2009 05:07:42 +0000 (22:07 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Tue, 9 Jun 2009 05:07:42 +0000 (22:07 -0700)

Trivial merge