From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 22 Nov 2011 23:05:20 +0000 (-0500)
Subject: merge tip
X-Git-Tag: rel_0_7_4~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75ae0c7c1210460cd6fa1d0f12261dfb74610e58;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

75ae0c7c1210460cd6fa1d0f12261dfb74610e58