From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 11 Apr 2010 16:18:50 +0000 (-0400)
Subject: merge trunk
X-Git-Tag: rel_0_6_0~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e50f119e9344d180768ffe2523eb169682e2957;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge trunk
---

9e50f119e9344d180768ffe2523eb169682e2957