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

[nucleo]

commit 372b1773610ee4a8911be585d5171a0a2d24e0bc
Merge: 9ae4f70 66ca219
Author: nucleo <nucleo at fedoraproject.org>
Date:   Thu Dec 15 13:50:14 2011 +0200

    Merge branch 'master' into f16

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