From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 2 Mar 2013 21:31:26 +0000 (-0500)
Subject: merge this
X-Git-Tag: rel_0_8_0~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36ed056e0c6b5882ff382ee5fccb55fab901f836;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge this
---

36ed056e0c6b5882ff382ee5fccb55fab901f836