Merge commit 'origin/adv' into gpxe-support
authorH. Peter Anvin <hpa@zytor.com>
Thu, 10 Jan 2008 19:23:31 +0000 (11:23 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 10 Jan 2008 19:31:01 +0000 (11:31 -0800)
commite4f38f33f51f55fd555f2f9b8ef31f29b310c257
tree334ae5240c65d30b1cc0a144a33887ea495f6407
parente5110251c1dbf48532d1fda78e5b0f812427911d
parentc072d12df4b43aef3375c190358da4928a0c2a1e
Merge commit 'origin/adv' into gpxe-support

Conflicts:

pxe.inc
NEWS
dnsresolv.inc
pxe.inc