From: Kevin M. Rosenberg <kevin@rosenberg.net>
Date: Sun, 16 May 2004 13:19:41 +0000 (+0000)
Subject: r9375: fix conflicted merge
X-Git-Tag: v3.8.6~445
X-Git-Url: http://git.kpe.io/?a=commitdiff_plain;h=1bac7acdc0e57f7d430d7fa6f79478811db38b6f;hp=1bac7acdc0e57f7d430d7fa6f79478811db38b6f;p=clsql.git

r9375: fix conflicted merge
---