fixed size calculation
Merge branch 'mozilla_sync_1.2' into delete_storage