Merge remote branch 'spice/usb.5' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Feb 2011 21:21:23 +0000 (15:21 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 1 Feb 2011 21:21:23 +0000 (15:21 -0600)
1  2 
ui/vnc.c

diff --cc ui/vnc.c
Simple merge