Merge remote branch 'origin/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Jul 2010 13:19:53 +0000 (08:19 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 15 Jul 2010 13:19:53 +0000 (08:19 -0500)

Trivial merge