[pymol/el6: 26/26] Merge branch 'master' into el6

[Timothy Fenn]

commit d52521654745333bd3eb4b567dd3a95af0e4cbbe
Merge: cba2200 8749931
Author: Tim Fenn <tim.fenn at gmail.com>
Date:   Sun Jan 13 00:57:49 2013 -0800

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

 .gitignore           |    9 ++--
 pymol-init.py.patch  |   11 ++++
 pymol-setup.py.patch |   45 +++++++++++++++++
 pymol.desktop        |   12 +++--
 pymol.spec           |  134 +++++++++++++++++++++++++++++++++++++-------------
 sources              |    3 +-
 6 files changed, 169 insertions(+), 45 deletions(-)
---