Bug 840210 - search engine must be customizable at build time
Merge pull request #11379 from benfrancis/840210

Bug 840210 - search engine must be customizable at build time. r=daleharvey