[kdevelop-php/f14/master: 5/5] Merge remote-tracking branch 'origin/f15/master' into f14/master

[Rex Dieter]

commit 122744d27e9110047b22a17ea8e90ada25db6252
Merge: 59f56e1 9418ef0
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Mar 22 15:18:19 2011 -0500

    Merge remote-tracking branch 'origin/f15/master' into f14/master
    
    Conflicts:
    	.gitignore
    	kdevelop-php.spec
    	sources

 .gitignore        |    4 ++--
 kdevelop-php.spec |   25 +++++++++++++++++--------
 sources           |    4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)
---