[kdetoys/f14: 2/2] Merge branch 'f15' into f14

[Than Ngo]

commit e23a654aa225ac24bb5a8c195f259d8df1d1fcb1
Merge: a886e84 6a49f29
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 16:26:07 2011 +0200

    Merge branch 'f15' into f14

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