From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Apr 2010 15:00:19 +0000 (-0400)
Subject: branch merge
X-Git-Tag: rel_0_6_0~64^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=efa88d4af96e78751409e2f4a66bafe866286d8d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

branch merge
---

efa88d4af96e78751409e2f4a66bafe866286d8d