From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 24 Aug 2010 17:30:51 +0000 (-0400)
Subject: merge from tip
X-Git-Tag: rel_0_7b1~252^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ab906e258eec23841c7f0c67266ebb337382277;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge from tip
---

7ab906e258eec23841c7f0c67266ebb337382277