[kdevelop/f13/master: 7/7] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit ce27888ae7009fe1eb47a9bdd5e5fdeb01f38a76
Merge: ba5a07c 1501f58
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Dec 6 11:26:29 2010 -0600

    Merge remote branch 'origin/master' into f13/master

 .gitignore    |    6 +-----
 kdevelop.spec |   32 +++++++++++++++++++++++++++-----
 sources       |    2 +-
 3 files changed, 29 insertions(+), 11 deletions(-)
---