Merge remote-tracking branch 'spice/spice.v38' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 13:02:35 +0000 (08:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 19 Jul 2011 13:02:35 +0000 (08:02 -0500)

Trivial merge