Merge remote branch 'arm/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:25:17 +0000 (08:25 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:25:17 +0000 (08:25 -0600)

Trivial merge