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

Trivial merge