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

[Peter Robinson]

Summary of changes:

  4983176... recompiling .py files against Python 2.7 (rhbz#623368) (*)
  9026eb4... v21 (*)
  236f717... fix lang build (*)
  c5f55f0... - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass (*)
  a80aaa1... v24 (*)
  3157259... v25 (*)
  bfe6ef9... fix merge

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