[oxygen-icon-theme/f14/master: 9/9] Merge remote-tracking branch 'origin/f15/master' into f14/master

[Rex Dieter]

commit b78e7774dab2cea98c3cad5b051d7721b8686ca2
Merge: 51703d7 65809e2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 11 10:35:58 2011 -0600

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

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