tree b2cf65f9d9394faa3666f395a2f6362d1cf351d3
parent 1d8b85bed183517991ec87e1df99bce768e4d913
parent a81ad1758c7cc9ab8dc8e78ceacc8878db77ef52
author drh <drh@noemail.net> 1386771426 +0000
committer drh <drh@noemail.net> 1386771426 +0000

Merge in the latest trunk changes.

FossilOrigin-Name: 9ff4dfe1e36b40e386858b03f36cfab8f6806fdd