Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2 * commit '0ce8431c15078e095a22a123dbabcd91049a9652': don't reschedule syncs that failed with a tooManyRetries error
Merge commit '0ce8431c15078e095a22a123dbabcd91049a9652' into eclair-mr2 * commit '0ce8431c15078e095a22a123dbabcd91049a9652': don't reschedule syncs that failed with a tooManyRetries error