Merge remote branch 'mst/for_anthony' into HEAD
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Jun 2010 18:34:20 +0000 (13:34 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Jun 2010 18:34:20 +0000 (13:34 -0500)

Trivial merge