[python-migrate0.5/el6/master: 2/3] Merge branch 'master' into el6

[Toshio くらとみ]

commit d42156623adab0cd6eb198cab9e302784fe0aae3
Merge: 2b124af 2e80fb4
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Jan 13 09:01:17 2011 -0800

    Merge branch 'master' into el6

 python-migrate0.5.spec |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)
---