From: Kevin Rosenberg <kevin@rosenberg.net>
Date: Fri, 29 Jan 2010 23:53:33 +0000 (-0700)
Subject: merge from master
X-Git-Tag: v5.0.0~41
X-Git-Url: http://git.kpe.io/?p=clsql.git;a=commitdiff_plain;h=ae62bdc5e434f49558d3f0a6e08a52943cba6713

merge from master
---

ae62bdc5e434f49558d3f0a6e08a52943cba6713