Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 20 Sep 2010 18:22:20 +0000 (13:22 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 20 Sep 2010 18:22:20 +0000 (13:22 -0500)

Trivial merge