Re-sync bdb-error.diff
Re-sync bdb-error.diff

community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server,community-ssu/evolution-data-server