From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 3 Mar 2012 18:01:14 +0000 (-0500)
Subject: merge this
X-Git-Tag: rel_0_7_6~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb83ddaff977554b5afde6a3e56ef00cd1eced36;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge this
---

fb83ddaff977554b5afde6a3e56ef00cd1eced36