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

[Rex Dieter]

commit e48b098d4adbe67dde44b13f4dbbedd2a77adb5e
Merge: d8f3cdf 1d56b54
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 14:38:17 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	kde-baseapps.spec
    	sources

 .gitignore        |    3 +--
 kde-baseapps.spec |   43 +++++++++++++++++++++++++++++++++----------
 sources           |    2 +-
 3 files changed, 35 insertions(+), 13 deletions(-)
---