[x11vnc/el5: 8/8] Merge remote-tracking branch 'origin/master' into el5

[Pavel Alexeev]

commit 1b6b23a8c730d7f8a43c2499faa4c5426e0be52d
Merge: 3433fde 5e4dcac
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Sun Apr 14 17:12:34 2013 +0400

    Merge remote-tracking branch 'origin/master' into el5

 x11vnc-0.9.8-XShm-explicit-include.patch |   10 --------
 x11vnc.spec                              |   34 +++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 15 deletions(-)
---