[oxygen-icon-theme/f13/master: 16/16] Merge remote branch 'origin/master' into f13/master

[Rex Dieter]

commit 3c754472b020486d68ea1ec36effcd8c1e83bc34
Merge: 784d0ad 9ff8bf1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Oct 21 14:00:53 2010 -0500

    Merge remote branch 'origin/master' into f13/master
    
    Conflicts:
    	.gitignore
    	oxygen-icon-theme.spec
    	sources

 .gitignore             |    2 +-
 oxygen-icon-theme.spec |   37 +++++++++++++++++++++++++++++++------
 sources                |    2 +-
 3 files changed, 33 insertions(+), 8 deletions(-)
---