[python-migrate/el6/master: 8/8] Merge branch 'master' into el6

[Toshio くらとみ]

commit 025ba18e6e0000532efb78a3ad9fdb0a1f1bc348
Merge: 7e8376e 731cb66
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 6 15:39:27 2011 -0800

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	python-migrate-0.5.4-rename.patch
    	python-migrate.spec
    	sources

 .gitignore                        |    2 +-
 migrate-py27.patch                |   31 ++++++++++++++++++++++++
 migrate-scripttest-update.patch   |   12 +++++++++
 python-migrate-0.5.4-rename.patch |   14 -----------
 python-migrate.spec               |   47 +++++++++++++++++++++++++++++++-----
 sources                           |    2 +-
 6 files changed, 85 insertions(+), 23 deletions(-)
---
diff --cc .gitignore
index dc4b42a,47067c9..3bf2496
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--sqlalchemy-migrate-0.5.4.tar.gz
+ sqlalchemy-migrate-0.6.tar.gz