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

[Rex Dieter]

commit 48ede4e1f53881e9306d9333dd6fc4a492bf5e30
Merge: a97ade5 36f3ee3
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 13:05:38 2012 -0500

    Merge branch 'f17' into f16

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