[xorg-x11-drv-synaptics/f19: 2/2] Merge branch 'master' into f19

[Peter Hutterer]

commit 7ade4e2355e5c6166bd4bab203fcbaa4b0bad849
Merge: 91a1714 e0364a3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jul 22 15:21:15 2013 +1000

    Merge branch 'master' into f19

 ...Disable-driver-scaling-for-input-ABI-19.2.patch |   98 ++++++++++++++++++++
 xorg-x11-drv-synaptics.spec                        |    9 ++-
 2 files changed, 106 insertions(+), 1 deletions(-)
---