From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 25 Aug 2010 15:01:46 +0000 (-0400)
Subject: merge changes from alternate branch
X-Git-Tag: rel_0_6_4~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1402a608ebc28031ce11dec9ed6a90785f09294d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge changes from alternate branch
---

1402a608ebc28031ce11dec9ed6a90785f09294d