Merge remote branch 'spice/submit.6' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 5 Oct 2010 19:14:19 +0000 (14:14 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 5 Oct 2010 19:14:19 +0000 (14:14 -0500)
commitbc2ece0a2f6b66a8562c7fca2d00698516bf6883
tree94e721b263ae28e68e8f1ccd1aa7db401c8b7129
parenta42acd0c976bfa89030a9bb7af6d5838e69f01bb
parent43a7a26763a527dc2fc375d8959133d7b9b496e9
Merge remote branch 'spice/submit.6' into staging

Conflicts:
configure

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Makefile.objs
configure
qemu-config.c
vl.c