[oxygen-icon-theme/f14: 2/2] Merge branch 'f15' into f14

[Rex Dieter]

commit 442d7d35be863deca55a2b0899f75ab1bcfedc3a
Merge: 76d970b c905b86
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jul 1 08:14:39 2011 -0500

    Merge branch 'f15' into f14

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