Merged recent trunk changes into Carl's branch, and resolved (or attempted to)
some conflicts in dCursorMixin.
Carl, can you re-review all the pertinent areas? We are failing one of the
db/tests/test_dCursorMixin.py tests.
The main thing that seemed to change was that you were calling encloseSpaces()
but I guess that method went away and was replaced by encloseNames().
As soon as we have your branch working and up-to-date with trunk, we'll merge
the differences into trunk and the parameterization project will be complete.
