Merge remote-tracking branch 'hdt/master'
authorH. Peter Anvin <hpa@zytor.com>
Mon, 25 Apr 2011 21:34:30 +0000 (14:34 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 25 Apr 2011 21:34:30 +0000 (14:34 -0700)

Trivial merge