From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 20 Mar 2010 18:42:27 +0000 (-0400)
Subject: merge
X-Git-Tag: rel_0_6beta2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1d6d350c72c90ef31a5753419d8d55299a123997;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge
---

1d6d350c72c90ef31a5753419d8d55299a123997