sqlalchemy: merge with source:trunk@...
Authored by: mgood 2006-10-11
Parent: [r3885]
Child: [r3887]