[avogadro/f13/master: 12/12] Merge branch 'master' into f13

[Rex Dieter]

commit 1bf1564061d743bf12814bc883c7dbe728183a60
Merge: b2aebf0 03423c9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Aug 24 11:39:45 2010 -0500

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore

 .gitignore                  |    2 +-
 avogadro-1.0.0-sip410.patch |   14 ------
 avogadro-icon.patch         |   15 ------
 avogadro.desktop            |   10 ----
 avogadro.spec               |  101 ++++++++++++++++++++++++++++++++-----------
 sources                     |    2 +-
 6 files changed, 78 insertions(+), 66 deletions(-)
---