[oxygen-icon-theme/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit a97ade55791ab8da8008afd244ab0a447e8ce7d6
Merge: 2a0c82b bc300df
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 13:07:48 2012 -0500

    Merge branch 'master' into f16

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