From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 13 Apr 2010 00:24:08 +0000 (-0400)
Subject: merge tip
X-Git-Tag: rel_0_6_0~23^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5745f7a7c2eade1ff70ad7831854e4212eefe1bd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

5745f7a7c2eade1ff70ad7831854e4212eefe1bd