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
merge from trunk
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
merge tjoneslo: Types2 removal

Merge pull request #881 from tjoneslo/akiban-server/types2-removal
https://github.com/FoundationDB/sql-layer/pull/881
Merge branch 'master' into fdb-not-fdb

Conflicts:
	src/main/java/com/foundationdb/qp/persistitadapter/PersistitAdapter.java
	src/main/java/com/foundationdb/qp/persistitadapter/indexrow/PersistitIndexRow.java
	src/test/java/com/foundationdb/qp/operator/OperatorTestHelper.java