From: Chris Withers <chris@simplistix.co.uk>
Date: Tue, 13 Apr 2010 15:48:24 +0000 (+0100)
Subject: merge tip
X-Git-Tag: rel_0_6_0~23^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7de6de60fcf4fcdc58344bafa1d718868f12c516;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge tip
---

7de6de60fcf4fcdc58344bafa1d718868f12c516