Merge change Id572ffc7 into eclair

* changes:
  don't throw an exception when we can't find a pending sync operation in the database