Changeset 1340+

Merges with the 2.6 alpha stuff, and looks to break multidb.

I haven't fully verified it, but that looks to be the culprit. I'll have to test some more to be sure, but if you like to keep up with trac, be careful.

Edit: Make that Changeset 1336+, as there were 31 changes in that revision. 1340 is just removing an extra variable.