[python-migrate0.5/el5: 12/12] Merge branch 'master' into el5

[Toshio くらとみ]

commit 78c2c0468685fb3c31c20a7556edaff6c4b66b27
Merge: 32d9b2b 65e8e1e
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Sun Jul 17 19:45:19 2011 -0700

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	python-migrate-sqlalchemy-migrate.patch
    	python-migrate0.5-SA0.5.patch
    	python-migrate0.5.spec
    	sources

 .gitignore                              |    2 +-
 python-migrate-sqlalchemy-migrate.patch |   11 ++++++-----
 python-migrate0.5-SA0.5.patch           |   30 ++++++++++++++++++------------
 python-migrate0.5.spec                  |   30 +++++++++++++++++++++++-------
 sources                                 |    2 +-
 5 files changed, 49 insertions(+), 26 deletions(-)
---
diff --cc .gitignore
index fc76b27,2a5fde5..223c7bf
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--sqlalchemy-migrate-0.5.3.tar.gz
+ /sqlalchemy-migrate-0.5.4.tar.gz