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