Merge remote branch 'erwan/master_new'
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 22 Jun 2010 21:34:59 +0000 (14:34 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 22 Jun 2010 21:34:59 +0000 (14:34 -0700)

Trivial merge