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

[Toshio くらとみ]

commit 68ac958cdbdb47306abf8673d0e94aa6eccb74b7
Merge: aa58a9f 0c6685b
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Jan 22 17:51:35 2013 -0800

    Merge branch 'master' into f16

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