[eric/f13/master: 12/12] Merge remote-tracking branch 'origin/master' into f13/master

[Rex Dieter]

commit 151941abbc06a38d64bc75d95436adca11dbd9c3
Merge: eaea7b0 01846c9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri May 6 09:35:33 2011 -0500

    Merge remote-tracking branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	eric.spec
    	sources

 .gitignore                 |   36 +++++++----------------------
 eric.spec                  |   52 ++++++++++++++++++++++++++++---------------
 eric4-4.4.0-shebang.patch  |   16 -------------
 eric4-4.4.13-shebang.patch |   16 +++++++++++++
 eric4.desktop              |    2 +-
 sources                    |   18 +++++++-------
 6 files changed, 69 insertions(+), 71 deletions(-)
---