Merge branch 'master' into pathbased
authorH. Peter Anvin <hpa@zytor.com>
Tue, 11 May 2010 20:55:32 +0000 (13:55 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 11 May 2010 20:55:32 +0000 (13:55 -0700)

Trivial merge