Merge remote-tracking branch 'amitshah/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 28 Apr 2011 13:37:54 +0000 (08:37 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 28 Apr 2011 13:37:54 +0000 (08:37 -0500)

Trivial merge