[oxygen-icon-theme/f16: 2/2] Merge branch 'f17' into f16

[Rex Dieter]

commit fc1d6c3c1d077e509f7578c7ca264bbbbfe7f45b
Merge: 48ede4e 969398b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 09:51:01 2012 -0500

    Merge branch 'f17' into f16

 .gitignore             |    1 +
 oxygen-icon-theme.spec |    5 ++++-
 sources                |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---