Merge remote-tracking branch 'mst-tmp/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:22:10 +0000 (15:22 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:22:10 +0000 (15:22 -0500)

Trivial merge