[python-migrate/el6] (3 commits) ...Merge branch 'f15' into el6

[Toshio くらとみ]

Summary of changes:

  a16524c... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  277463a... cherrypick the Require python-tempita fix (*)
  aec49df... Merge branch 'f15' into el6

(*) This commit already existed in another branch; no separate mail sent