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

[Peter Hutterer]

commit e6c6fc511156c576bdf07d6b6a2f6644bf3ec208
Merge: 18eb590 b16ec58
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu May 16 08:33:45 2013 +1000

    Merge branch 'master' into f19
    
    Conflicts:
    	xorg-x11-drv-synaptics.spec

 xorg-x11-drv-synaptics.spec |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---