Merge branch 'master' of git://git.etherboot.org/scm/gpxe
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Wed, 15 Apr 2009 23:20:49 +0000 (16:20 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Wed, 15 Apr 2009 23:20:49 +0000 (16:20 -0700)

Trivial merge