Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 2 Dec 2010 20:16:40 +0000 (14:16 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 2 Dec 2010 20:16:40 +0000 (14:16 -0600)

Trivial merge