Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Jul 2010 13:17:57 +0000 (08:17 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Jul 2010 13:17:57 +0000 (08:17 -0500)

Trivial merge