Merge branch 'master' of git://git.etherboot.org/scm/gpxe
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Thu, 28 May 2009 18:50:10 +0000 (11:50 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Thu, 28 May 2009 18:50:10 +0000 (11:50 -0700)

Trivial merge