[oxygen-icon-theme/f13/master: 7/7] Merge remote branch 'origin/f14/master' into f13/master

[Rex Dieter]

commit f4957271c4d300a21b59fab86a8eda2e4396df06
Merge: 27a0d0e 5ee3403
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Dec 4 11:31:18 2010 -0600

    Merge remote branch 'origin/f14/master' into f13/master

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