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

[Than Ngo]

commit 35d9b290bc895e476ef89bdfdfb8464f493e4d30
Merge: e929167 848e884
Author: Than Ngo <than at redhat.com>
Date:   Thu Dec 6 15:34:53 2012 +0100

    Merge branch 'f18' into f17

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