[avogadro/f12/master: 27/27] Merge remote branch 'origin/f13/master' into f12/master

[Rex Dieter]

commit 30ef8f42cb9b7c0ac5082c20c67f0e92be4788fe
Merge: ea6f1de 34824e7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Oct 22 07:06:38 2010 -0500

    Merge remote branch 'origin/f13/master' into f12/master
    
    Conflicts:
    	.gitignore
    	avogadro.spec
    	sources

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