Merge remote branch 'debian/daniel'
authorH. Peter Anvin <hpa@linux.intel.com>
Mon, 28 Jun 2010 22:56:43 +0000 (15:56 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 28 Jun 2010 22:56:43 +0000 (15:56 -0700)

Trivial merge