[sugar-jukebox/f18] (3 commits) ...fixed merge

[Kalpa Welivitigoda]

Summary of changes:

  6fbd794... v31 (*)
  acdb1c2... Merge branch 'master' of ssh://pkgs.fedoraproject.org/sugar (*)
  9773fee... fixed merge (*)

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