Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Jan 2011 18:07:17 +0000 (12:07 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 31 Jan 2011 18:07:17 +0000 (12:07 -0600)

Trivial merge