]> xenbits.xensource.com Git - qemu-upstream-4.4-testing.git/commitdiff
Merge remote-tracking branch 'spice/spice.v40' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:13:26 +0000 (17:13 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 4 Aug 2011 22:13:26 +0000 (17:13 -0500)

Trivial merge