[gtk-murrine-engine/f14/master: 4/4] Merge branch 'master' into f14/master

[Martin Sourada]

commit d8f759b79ad990d56503e05f2039bc3879391709
Merge: fe7d396 8f64f7b
Author: Martin Sourada <mso at fedoraproject.org>
Date:   Mon Oct 11 10:41:43 2010 +0200

    Merge branch 'master' into f14/master
    
    Conflicts:
    	gtk-murrine-engine.spec
    
    update to 0.98.0 (merge with master).

 .gitignore              |   14 +++++++-------
 gtk-murrine-engine.spec |    9 ++++++---
 sources                 |    2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --cc gtk-murrine-engine.spec
index ea9308f,7db3f43..39b82b8
--- a/gtk-murrine-engine.spec
+++ b/gtk-murrine-engine.spec
@@@ -57,8 -57,11 +57,11 @@@ rm -rf $RPM_BUILD_ROO
  %{_datadir}/themes/*
  
  %changelog
 -* Wed Sep 29 2010 jkeating - 0.98.0-2
 -- Rebuilt for gcc bug 634757
++* Mon Oct 08 2010 Martin Sourada <mso at fedoraproject.org> - 0.98.0-1
++- Update to 0.98.0 
+ 
 -* Thu Sep 23 2010 Martin Sourada <mso at fedoraproject.org> - 0.98.0-1
 -- Update to 0.98.0
 +* Wed Sep 29 2010 jkeating - 0.90.3-3.1
 +- Rebuilt for gcc bug 634757
  
  * Thu Nov 12 2009 Martin Sourada <mso at fedoraproject.org> - 0.90.3-3
  - Don't own %%{_datadir}/themes