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

Conflicts:
vl.c
configure
vl.c