[oxygen-icon-theme/f16: 12/12] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit aa9ae958ed035b2a55610ad9ac6c7144446891c9
Merge: efb0192 5a6ff13
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 19:08:09 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	oxygen-icon-theme.spec
    	sources

 .gitignore             |    2 +-
 oxygen-icon-theme.spec |   63 +++++++++++++++++++++++++++++++++++++----------
 sources                |    2 +-
 3 files changed, 51 insertions(+), 16 deletions(-)
---