[kactivities/f17: 2/2] Merge branch 'master' into f17

[Rex Dieter]

commit 7c9f723625157dafd8a8bbc4661df9ad77511b5b
Merge: a90a296 9a0d395
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 13:11:51 2012 -0500

    Merge branch 'master' into f17

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