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

[Rex Dieter]

commit 2a0c82bbcbf9df3fe360757919b943aff53e1081
Merge: aa9ae95 38cde8e
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 08:42:24 2012 -0500

    Merge branch 'master' into f16

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