Merge with 3.3x branch
authorH. Peter Anvin <hpa@zytor.com>
Thu, 4 Jan 2007 18:58:10 +0000 (10:58 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 4 Jan 2007 18:58:10 +0000 (10:58 -0800)

Trivial merge