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

[Rex Dieter]

commit 714a77e49e971d5aec72633fdd489b1fb9c15e03
Merge: f495727 51703d7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Jan 5 15:25:55 2011 -0600

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

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