Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 14:57:06 +0000 (09:57 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 29 Aug 2011 14:57:06 +0000 (09:57 -0500)

Trivial merge