[kdevelop/f16: 17/17] merge master

[Jaroslav Reznik]

commit 55264cde39ff10858ef67b3ecf165d5c3dc0865d
Merge: d9c1b70 9a94696
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Mon Mar 12 15:32:50 2012 +0100

    merge master

 .gitignore                    |    3 +-
 kdevelop-4.2.3-okteta08.patch |  963 +++++++++++++++++++++++++++++++++++++++++
 kdevelop-4.3.0-no-rpath.patch |   11 +
 kdevelop.spec                 |   57 ++-
 sources                       |    2 +-
 5 files changed, 1020 insertions(+), 16 deletions(-)
---