From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 3 Sep 2010 21:57:20 +0000 (-0400)
Subject: merge from tip
X-Git-Tag: rel_0_7b1~253^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=33b70a1f0259dd5e4acd2cb78c9a5ab6254cf9ce;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge from tip
---

33b70a1f0259dd5e4acd2cb78c9a5ab6254cf9ce