[xorg-x11-drv-wacom/f15/master: 5/5] Merge branch 'master' into f15

[Peter Hutterer]

commit 14bb2251ea486fec5c444325c3ff4f2c86c233d7
Merge: 49f82f9 431e5c0
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Apr 19 15:43:43 2011 +1000

    Merge branch 'master' into f15

 .gitignore              |    3 +++
 sources                 |    2 +-
 xorg-x11-drv-wacom.spec |   19 ++++++++++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)
---