[xorg-x11-server/f21: 4/4] Merge branch 'master' into f21

[Adam Jackson]

commit f9e5e8571595d5f0cc797cb5c761cceb47045ff4
Merge: 83175e6 ee750e0
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Sep 11 11:12:06 2014 -0400

    Merge branch 'master' into f21

 patchwork-33052.patch |   77 +++++++++++++++++++++++++++++++++++++++++++++++++
 xorg-x11-server.spec  |   19 +++++++++---
 2 files changed, 91 insertions(+), 5 deletions(-)
---