[kdevplatform/f13/master: 2/2] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 683e0ea1075ec90a5190146ef0f7aa879f05cba6
Merge: b54a5bb 3cc0545
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Dec 6 10:11:29 2010 -0600

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	kdevplatform.spec

 .gitignore        |    6 +-----
 kdevplatform.spec |   10 +++++-----
 sources           |    2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)
---