[xorg-x11-server/f17: 2/2] Merge branch 'master' into f17

[Dan Horák]

commit 96d42b0a5085893677d11e68fba1a06e8673f718
Merge: 5e4e2bc 5e785a7
Author: Dan Horák <dan at danny.cz>
Date:   Sun Jun 17 09:13:20 2012 +0200

    Merge branch 'master' into f17

 xorg-x11-server.spec                 |    7 ++++++-
 xserver-1.12.2-xorg-touch-test.patch |   30 ++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)
---