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

[Rex Dieter]

commit 80320c83746a7057ac9dec91487df06c997ce67d
Merge: e853c26 9ff8bf1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Oct 2 15:31:53 2010 -0500

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

 .gitignore             |    2 +-
 oxygen-icon-theme.spec |   13 ++++++++++++-
 sources                |    2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)
---