Merge remote branch 'spice/config.2' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 1 Nov 2010 18:02:56 +0000 (13:02 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 1 Nov 2010 18:02:56 +0000 (13:02 -0500)

Trivial merge