Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 21 Sep 2010 22:50:58 +0000 (17:50 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 21 Sep 2010 22:50:58 +0000 (17:50 -0500)

Trivial merge