Merge remote-tracking branch 'aneesh/for-upstream-4' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Sep 2011 18:28:28 +0000 (13:28 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Sep 2011 18:28:28 +0000 (13:28 -0500)

Trivial merge