Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:02:18 +0000 (09:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 15 Jun 2011 14:02:18 +0000 (09:02 -0500)

Trivial merge