From: Ken Hornstein <kenh@pobox.com>
Date: Fri, 5 Sep 2003 21:07:49 +0000 (+0000)
Subject: Merge in changes from the 1.1 branch.
X-Git-Tag: RELEASE_1_2~87
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=557d33aeabe46e9a0411959703f721c5b9ce2ae9;hp=557d33aeabe46e9a0411959703f721c5b9ce2ae9;p=mmh

Merge in changes from the 1.1 branch.
---