Merge branch 'master' into new-preproc
authorH. Peter Anvin <hpa@zytor.com>
Thu, 16 Jul 2009 14:18:43 +0000 (10:18 -0400)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 16 Jul 2009 14:18:43 +0000 (10:18 -0400)

Trivial merge