Merge remote-tracking branch 'amit/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:22:03 +0000 (08:22 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 31 May 2011 13:22:03 +0000 (08:22 -0500)

Trivial merge