[sugar-typing-turtle/f17] (3 commits) ...v30_conflict fixed

[Kalpa Welivitigoda]

Summary of changes:

  64eaee2... - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass (*)
  af9b02c... v30 (*)
  cb9b28a... v30_conflict fixed (*)

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