[python-fedora/f16: 2/2] Merge branch 'master' into f16

[Toshio くらとみ]

commit baeac240e328ef8577073e87dbea60703293fc4f
Merge: 23bf2f5 3bdf1ec
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Mar 8 13:44:00 2012 -0800

    Merge branch 'master' into f16

 .gitignore         |    1 +
 python-fedora.spec |    6 ++++--
 sources            |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)
---