Merge commit 'erwan-hdt/master' into hdt
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 2 Mar 2009 18:40:49 +0000 (10:40 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 2 Mar 2009 18:40:49 +0000 (10:40 -0800)

Trivial merge