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

[thomasj]

commit 3ab234e9e009b58470f307ec28ff4a782eaa7e5d
Merge: a89b431 fd5bb3a
Author: Thomas Janssen <thomasj at fedoraproject.org>
Date:   Fri Oct 22 15:39:08 2010 +0200

    Merge remote branch 'origin/master' into f13

 .gitignore        |    2 ++
 kdevplatform.spec |   19 ++++++++++++++++---
 sources           |    2 +-
 3 files changed, 19 insertions(+), 4 deletions(-)
---