[oxygen-icon-theme/f17: 10/10] Merge branch 'master' into f17

[Rex Dieter]

commit 6b85cc613ec1d7a37e5ecc60bbdcd29a28361535
Merge: 969398b 21db4f9
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 12:19:14 2012 -0500

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

 .gitignore             |    3 +-
 oxygen-icon-theme.spec |   53 +++++++++++++++++++++++++++++------------------
 sources                |    2 +-
 3 files changed, 35 insertions(+), 23 deletions(-)
---