[pymol/el5: 39/39] Merge branch 'master' into el5

[Timothy Fenn]

commit 9d91984b2cb4c3dc4591336e7e2dcdd662b6b19f
Merge: 81a3149 8749931
Author: Tim Fenn <tim.fenn at gmail.com>
Date:   Sat Jan 12 18:55:49 2013 -0800

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	pymol.desktop
    	pymol.spec
    	sources

 .gitignore           |    6 ++-
 pymol-init.py.patch  |   11 +++
 pymol-setup.py.patch |   45 ++++++++++++
 pymol.desktop        |   12 ++--
 pymol.spec           |  188 ++++++++++++++++++++++++++++++++++++++-----------
 sources              |    2 +-
 6 files changed, 215 insertions(+), 49 deletions(-)
---