[spice-gtk/f20: 5/5] Merge branch 'master' into f20

[Marc-André Lureau]

commit 3b519b77ad61986a4953f5386a3e74e3614e98da
Merge: e38a395 996650c
Author: Marc-André Lureau <marcandre.lureau at gmail.com>
Date:   Wed Dec 18 14:35:08 2013 +0100

    Merge branch 'master' into f20
    
    Conflicts:
    	spice-gtk.spec

 .gitignore                                         |    1 +
 ...el-Fix-usbredir-being-broken-since-commit.patch |   30 --
 0002-display-fix-palette-regression.patch          |   45 ---
 0003-display-cache-id-is-uint64_t.patch            |   25 --
 ...-increase-contrast-better-looking-putty-c.patch |   42 ---
 ...nel.c-add-cursor-print-function-for-debug.patch |   63 ----
 ...nel-cursor-mono-cursors-edge-highlighting.patch |  382 --------------------
 0007-display-blank-surface-on-creation.patch       |   34 --
 sources                                            |    2 +-
 spice-gtk.spec                                     |   28 +--
 10 files changed, 7 insertions(+), 645 deletions(-)
---