Code review comment for lp:~mterry/ubuntuone-couch/longer-timeout

Would be happy to accept this, but the diff shows a conflict, likely because the other branch was already merged. Could you pull again/remerge trunk, and push again?