]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge remote-tracking branch 'spice/spice.v46' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 18:06:46 +0000 (13:06 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Nov 2011 18:06:46 +0000 (13:06 -0500)

Trivial merge