[oxygen-icon-theme/f14: 4/4] Merge branch 'f15' into f14

[Than Ngo]

commit 76d970b9bbcb5217f256a4f1340acc4f3d127220
Merge: b48008a 53b89dd
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 9 16:29:40 2011 +0200

    Merge branch 'f15' into f14

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