Merge remote branch 'jvrao/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:22:31 +0000 (08:22 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Dec 2010 14:22:31 +0000 (08:22 -0600)

Trivial merge