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

[nucleo]

commit 9ae4f70135a81020d65121cc6970f3c3a8f9b48a
Merge: cc6885e f25b950
Author: nucleo <nucleo at fedoraproject.org>
Date:   Fri Nov 18 15:06:02 2011 +0200

    Merge branch 'master' into f16

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