Merge remote-tracking branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 12:43:54 +0000 (07:43 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 12:43:54 +0000 (07:43 -0500)

Trivial merge