Merge branch 'new-preproc'
authorH. Peter Anvin <hpa@zytor.com>
Mon, 20 Jul 2009 05:36:44 +0000 (22:36 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 20 Jul 2009 05:36:44 +0000 (22:36 -0700)

Trivial merge