[python-fedora/el6/master: 3/3] Merge branch 'master' into el6

[Toshio くらとみ]

commit 9030a696bf8e13b24bb2a60532582261ccaa4914
Merge: aec936a 2e53afd
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Fri Apr 29 19:41:12 2011 -0700

    Merge branch 'master' into el6

 .gitignore         |    1 +
 python-fedora.spec |   18 ++++--------------
 sources            |    2 +-
 3 files changed, 6 insertions(+), 15 deletions(-)
---
diff --cc .gitignore
index 481486d,c5c7f66..05b8562
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -python-fedora-0.3.20.tar.gz
  /python-fedora-0.3.21.tar.gz
+ /python-fedora-0.3.22.tar.gz