Merge remote branch 'sha0/for_hpa' into pathbased
authorH. Peter Anvin <hpa@zytor.com>
Sun, 20 Jun 2010 02:08:39 +0000 (19:08 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Sun, 20 Jun 2010 02:08:39 +0000 (19:08 -0700)

Trivial merge