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

[Toshio くらとみ]

commit 0aa9d31e297fe8c46115277319d618561fb3c762
Merge: ac58876 9e88d7e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Tue Jul 26 16:36:55 2011 -0700

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore

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