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

[Toshio くらとみ]

commit f908ed337aed4ac0f81fdbe16575f68aa0763964
Merge: da7ec9c 9619182
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jun 7 09:21:14 2012 -0700

    Merge branch 'master' into f16

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