Merge remote-tracking branch 'aneesh/for-upstream-1' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 12:52:53 +0000 (07:52 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 12 Aug 2011 12:52:53 +0000 (07:52 -0500)

Trivial merge