[kdevelop/f15: 8/8] Merge remote-tracking branch 'origin/master' into f15

[Rex Dieter]

commit 56ebb0b1a5df23b2e4803b38cec8cdd3b66e3fa9
Merge: 0d96204 851e9ed
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 22 10:10:20 2011 -0500

    Merge remote-tracking branch 'origin/master' into f15
    
    Conflicts:
    	kdevelop.spec

 kdevelop.spec |   19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)
---