[ktouch/f17: 2/2] Merge branch 'f18' into f17

[Than Ngo]

commit 557795ba977b3d0ec7c1fb01301fa2e70ffcffff
Merge: fa0bce6 af9e61d
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:42:14 2012 +0100

    Merge branch 'f18' into f17

 .gitignore  |    1 +
 ktouch.spec |    5 ++++-
 sources     |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---