[sugar-portfolio/f15] (7 commits) ...Merge branch 'master' into f15

[Kalpa Welivitigoda]

Summary of changes:

  cb6ae58... - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass (*)
  ffb33d6... v20 (*)
  8f6aa1b... Revert "v20" (*)
  3b33d7c... Merge branch 'master' of ssh://pkgs.fedoraproject.org/sugar (*)
  d99b373... v20 (*)
  4ee2ac3... Revert "v20"
  a30e407... Merge branch 'master' into f15

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