am 32673c3b: am 2ad2455f: Merge change I86397f6c into eclair-mr2

Merge commit '32673c3b173fe55c816463cd6e64d0cd053fd963'

* commit '32673c3b173fe55c816463cd6e64d0cd053fd963':
  moved the hidden sync helpers out of the framework