Merge remote-tracking branch 'aneesh/for-upstream-8' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 Nov 2011 17:30:00 +0000 (12:30 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 2 Nov 2011 17:30:00 +0000 (12:30 -0500)

Trivial merge