Merge 'trunk' into 'prefetch'

r5681@rkinyon-lt-osx (orig r5680):  ribasushi | 2009-03-03 16:43:48 -0500
Clarify sybase/nobindvars problem (should have never merged in the 1st place)
r5682@rkinyon-lt-osx (orig r5681):  ribasushi | 2009-03-03 17:21:29 -0500
Backout entire sybase/nobindvars/noquote changeset - not ready yet
r5684@rkinyon-lt-osx (orig r5683):  ribasushi | 2009-03-03 17:32:50 -0500
Put code back into branch (and fix trunk snafu)