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

[Toshio くらとみ]

commit 79d74c728e57f5698f10f482464b1e9667f7f021
Merge: b61aa15 62ea07e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Oct 6 08:42:57 2011 -0700

    Merge branch 'master' into f16

 .gitignore         |    2 +
 python-fedora.spec |  147 ++++++++++++++++++----------------------------------
 sources            |    2 +-
 3 files changed, 54 insertions(+), 97 deletions(-)
---