Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:31:26 +0000 (10:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 22 Sep 2011 15:31:26 +0000 (10:31 -0500)

Trivial merge