[synergy/el6: 5/5] Merge branch 'master' into el6

[Matthias Saou]

commit 35d4095a590a4dd722c3a355136458f18927689b
Merge: 48a32af 71d04ce
Author: Matthias Saou <thias at marmotte.net>
Date:   Wed Jul 13 00:31:20 2011 +0200

    Merge branch 'master' into el6

 .gitignore                                  |    2 +-
 sources                                     |    2 +-
 synergy-1.3.1-X11-DPMS.patch                |   33 ---
 synergy-1.3.1-X11-selection.patch           |   11 -
 synergy-1.3.1-copynpaste-crash.patch        |   63 ----
 synergy-1.3.1-gcc43.patch                   |  231 ---------------
 synergy-1.3.1-stuttered-delay-fix-fix.patch |   11 -
 synergy-1.3.1-stuttered-delay-fix.patch     |   58 ----
 synergy-1.3.1-warnings.patch                |   56 ----
 synergy.spec                                |  187 ++++---------
 synergyc.1                                  |  174 -----------
 synergys.1                                  |  410 ---------------------------
 12 files changed, 61 insertions(+), 1177 deletions(-)
---