[oxygen-gtk/f16: 6/6] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 90c00920e7537c9cd80f0dd0f988cb9cf742d455
Merge: 372b177 572a7ea
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Mar 8 06:52:13 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16

 .gitignore      |    6 -----
 oxygen-gtk.spec |   62 ++++++++++++++++++------------------------------------
 sources         |    1 -
 3 files changed, 21 insertions(+), 48 deletions(-)
---