Merge commit '47e98658f58b8afd319851f44edcb81f2d2d3774' into upstream-merge
commite927fab21d4da4021e971521e66deaccf842e075
authorMarcelo Tosatti <mtosatti@redhat.com>
Fri, 10 Feb 2012 18:15:24 +0000 (10 16:15 -0200)
committerMarcelo Tosatti <mtosatti@redhat.com>
Fri, 10 Feb 2012 18:15:24 +0000 (10 16:15 -0200)
tree0b0bcd22316f71bc46826f101edded9569398ac6
parent7253cfe3c16eb4a741c9f1c1aa8cce981a45899f
parent47e98658f58b8afd319851f44edcb81f2d2d3774
Merge commit '47e98658f58b8afd319851f44edcb81f2d2d3774' into upstream-merge

* commit '47e98658f58b8afd319851f44edcb81f2d2d3774':
  Add cap reduction support to enable use as SUID
  Add access control support to qemu bridge helper
  Add basic version of bridge helper
  hw/vmmouse.c: Disable vmmouse after reboot
  keep the PID file locked for the lifetime of the process

Conflicts:
configure

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Makefile
configure