From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 24 Nov 2010 17:22:17 +0000 (-0500)
Subject: merge tip
X-Git-Tag: rel_0_6_6~31^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aab439abc73976b077f1058f488be3e914b5861f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

aab439abc73976b077f1058f488be3e914b5861f