Merge remote-tracking branch 'spice/spice.v37' into staging
commitac779fe2334ebea5d4a365b053d786f7748a1db5
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Jun 2011 17:15:11 +0000 (8 12:15 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Jun 2011 17:15:11 +0000 (8 12:15 -0500)
tree5459fe587195dcb74b3b2ca19dc2d4a39a9fb31e
parent13748cf499fbd93468e7103c0866e073a666f270
parent212496c98219df17913f3157a7bf85575b32384f
Merge remote-tracking branch 'spice/spice.v37' into staging

Conflicts:
vl.c
configure
vl.c