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

[nucleo]

commit cc6885e0f7148109d6520a4fc2da1d3ddc1076b2
Merge: 302f91d b996886
Author: nucleo <nucleo at fedoraproject.org>
Date:   Fri Oct 28 22:49:58 2011 +0300

    Merge branch 'master' into f16

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