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