[sugar-moon/f14] (7 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  2a79599... recompiling .py files against Python 2.7 (rhbz#623381) (*)
  aca759b... bump build (*)
  3466bc8... bump build (*)
  acdfda2... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  a3e33de... v12 (*)
  a081db1... fix version and release (*)
  f0c34a2... fix merge

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