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

[thomasj]

commit edfb4001a5a565888a67e955772a0be8c0e070ee
Merge: f6b1aa1 fd5bb3a
Author: Thomas Janssen <thomasj at fedoraproject.org>
Date:   Fri Oct 22 15:23:42 2010 +0200

    Merge remote branch 'origin/master' into f14

 kdevplatform.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---