[oxygen-icon-theme/f14/master: 5/5] Merge branch 'master' into f14

[Rex Dieter]

commit 99fa0cad85d37ca662b3ad82197c54490d020d34
Merge: 74f0796 6cc9598
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Aug 28 23:59:54 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	oxygen-icon-theme.spec
    	sources

 .gitignore             |    4 ++++
 oxygen-icon-theme.spec |    5 ++++-
 sources                |    4 ++++
 3 files changed, 12 insertions(+), 1 deletions(-)
---
diff --cc .gitignore
index ce5e235,92a0a51..a1fc0e4
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +oxygen-icons-4.5.0.tar.bz2
++=======
+ /oxygen-icons-4.5.1.tar.bz2
++>>>>>>> master
diff --cc sources
index dc3b0a3,46254e0..b08355c
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +f266c3aaafed30d108dd562bea9b2d0b  oxygen-icons-4.5.0.tar.bz2
++=======
+ 02aa5d1145378a686b1329dca02fc681  oxygen-icons-4.5.1.tar.bz2
++>>>>>>> master