[Tracker] Merging the indexer-split branch to TRUNK

[Martyn Russell <martyn imendio com>]

Hi all,

After the hackfest this past weekend Jamie and I resolved the final
issues for the merge to go ahead with everyone's consent.

So the plan is to prepare for the merge today and to do the actual merge
tomorrow.

So far the planning consists of:

1. Merging all .po files over from TRUNK to the indexer-split branch.
2. Fixing any remaining migration paths for binaries.
3. Fixing database migration paths.
4. Commit any outstanding patches (e.g. the IMAP uid=NULL patch).

If there is anything here I have missed, please let me know.

So far #1 and #2 are done. We are thinking about how to detect #3 and in
that case to force a reindex (which effectively removes the database
files and starts again). As for #4, this should be done some time today.

-- 
Regards,
Martyn