Merge commit 'origin/master' into fsc
authorH. Peter Anvin <hpa@zytor.com>
Tue, 22 Dec 2009 23:55:11 +0000 (15:55 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 22 Dec 2009 23:55:11 +0000 (15:55 -0800)

Trivial merge