[Xen-changelog] [qemu-upstream-unstable] Merge remote-tracking branch 'spice/spice.v64' into staging

[patchbot@xxxxxxx]

commit fb43a4807ec06307048018d93a7f9e0828308bb5
Merge: 0a87470116a169f0c764894e46014a77f5d32a9e 
21a50d0b1a0745e485eff3e5aa393cdc4a1980b6
Author: Anthony Liguori <aliguori@xxxxxxxxxx>
Date:   Mon Nov 26 08:19:07 2012 -0600

    Merge remote-tracking branch 'spice/spice.v64' into staging
    
    * spice/spice.v64:
      spice: add new spice-server callbacks to ui/spice-display.c
      Fix the inconsistency in x509-dh-key-file parameter
    
    Signed-off-by: Anthony Liguori <aliguori@xxxxxxxxxx>

 ui/spice-core.c    |    2 +-
 ui/spice-display.c |   35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-upstream-unstable.git

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog