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

[Toshio くらとみ]

commit 43040dbde54e03e073f71244cd415237d5376317
Merge: 663a710 e3d1840
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 13 10:31:23 2011 -0800

    Merge branch 'master' into el6

 python-migrate.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---