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

[Rex Dieter]

commit b48008aafa3849c39ebac38584c79ec2b452c320
Merge: a1cb9ab 9fd6940
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Apr 30 11:42:34 2011 -0500

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

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