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)
commit80200fb46d3d1fd2d8d512391ad84d2b9fd64552
tree752df0768ba80f9bb7f3c9362cd6ffc43f31d3e8
parente4b2f7394042225b7b3907187c5e09166a1ae64a
parent23f55aedb5e63425d81096881d5048d1bb1ae3ff
Merge remote branch 'spice/config.2' into staging