From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 3 Apr 2012 22:55:10 +0000 (-0400)
Subject: merge fix
X-Git-Tag: rel_0_8_0b1~474^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60922f7a991cac6500c856868de0ab37f1203cc7;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merge fix
---

60922f7a991cac6500c856868de0ab37f1203cc7