[eric/el6: 24/24] Merge remote branch 'origin/master' into el6

[Rex Dieter]

commit 637ba1cded534c0f80f20bfdafd38d8fbca29957
Merge: e9c9375 a2e46a8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 14 08:57:32 2012 -0500

    Merge remote branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore
    	eric.spec
    	eric4.desktop
    	sources

 .gitignore                       |   29 ++++++---
 eric.spec                        |  132 +++++++++++++++++++++++++-------------
 eric4-4.4.13-shebang.patch       |   16 +++++
 eric4-4.4.19-no_patchPyXML.patch |   32 +++++++++
 eric4.desktop                    |    2 +-
 sources                          |   19 +++---
 6 files changed, 167 insertions(+), 63 deletions(-)
---