am 42be7440: am ee3a2443: Merge change Ic532c956 into eclair-mr2

Merge commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff'

* commit '42be7440ee2a3a360c83802e4e7a2ecf40220eff':
  Note to self: Don't reverse the arguments to fseek(o)...