update Merge conflicts
Update to remote
Merge pull request #1 from FoundationDB/master

Merge trunk to my fork?
Merge branch 'master' of https://github.com/tjoneslo/akiban-server
Up the default number of index histograms, but keep it fixed for the existing tests.
Add a duty cycle to index statistics scanning.
Get time limit from config service.
Move responsibility for index statistics warnings into the service and avoid repeating them for the same index.
Trigger background scan when enabled.
Address review comments.
Include fdbsqldump in packages.
merge from trunk
merge MMcM: Some index statistics related improvements

Merge pull request #5 from MMcM/akiban-server/index-statistics
https://github.com/FoundationDB/sql-layer/pull/5
merge MMcM: Include fdbsqlload in packages.

Merge pull request #880 from MMcM/akiban-server/client-loader-packaging
https://github.com/FoundationDB/sql-layer/pull/880
Add missing file
Add a test that shows the problem.
Add commitOrRetry to TransactionService, modeled after what's in the other branch.
Add retry count to row reader service and test.
Initialize from parser.
Update license.
merge MMcM: Add retry support to row reader.

Merge pull request #817 from MMcM/akiban-server/row-reader-retry
https://github.com/FoundationDB/sql-layer/pull/817