sqlalchemy: merge with source:trunk@...
Authored by: mgood 2006-10-06
Parent: [r3870]
Child: [r3872]