[sugar-browse/f18] (4 commits) ...fix merge

[Peter Robinson]

Summary of changes:

  7ba0ae6... v143 (*)
  c14765e... v144 (*)
  7b68cb0... v145 (*)
  e200c42... fix merge

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