[kde-baseapps/f17: 14/14] Merge branch 'master' into f17

[Than Ngo]

commit 78f595ee0923905dc422eda16493a363788831ff
Merge: eed906b 5807ec7
Author: Than Ngo <than at redhat.com>
Date:   Thu Mar 7 13:46:46 2013 +0100

    Merge branch 'master' into f17

 .gitignore                                     |    7 +-
 kde-baseapps-4.9.4-fix-bugs-311206-311246.diff |  232 ------------------------
 kde-baseapps.spec                              |  209 +++------------------
 sources                                        |    2 +-
 4 files changed, 30 insertions(+), 420 deletions(-)
---