Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 9 Aug 2010 13:25:12 +0000 (08:25 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 9 Aug 2010 13:25:12 +0000 (08:25 -0500)

Trivial merge