[gnome-python2/f16: 5/5] Merge branch 'master' into f16

[Michael Schwendt]

commit 41a8a017cd880ffe671340d2d08af62687990278
Merge: eaa2b03 78407db
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Fri Dec 2 12:05:58 2011 +0100

    Merge branch 'master' into f16
    
    Conflicts:
    	gnome-python2.spec

 gnome-python2.spec |   72 ++++++++++++++++++++++++++++++---------------------
 1 files changed, 42 insertions(+), 30 deletions(-)
---