Merge branch 'master' into ui
authorH. Peter Anvin <hpa@zytor.com>
Mon, 26 Jan 2009 01:13:43 +0000 (17:13 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Mon, 26 Jan 2009 01:13:43 +0000 (17:13 -0800)

Trivial merge