Merge branch 'pxefix' into pathbased
authorH. Peter Anvin <hpa@zytor.com>
Wed, 24 Feb 2010 03:11:13 +0000 (19:11 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 24 Feb 2010 03:11:13 +0000 (19:11 -0800)

Trivial merge