From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 12 Mar 2010 23:23:44 +0000 (+0000)
Subject: merging master...
X-Git-Tag: rel_0_6beta2~54^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d816c09f66f7d1735a764d27a187fbd0cd1f576e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

merging master...
---

d816c09f66f7d1735a764d27a187fbd0cd1f576e