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

[Toshio くらとみ]

commit 51257ccc4031c00e8a7b27959bdd0e4a57cf75bc
Merge: 68ac958 cc36712
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 24 18:12:43 2013 -0800

    Merge branch 'master' into f16

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