From: Carl N. Baldwin <carl@ecbaldwin.net>
Date: Tue, 13 Dec 2005 16:53:05 +0000 (-0700)
Subject: Merging release-0.2.1
X-Git-Tag: release-0.3.1
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%27.%20%24this-%3Ephpgw_js_url.%20%27/jscalendar/calendar-win2k-cold-1.css?a=commitdiff_plain;h=refs%2Ftags%2Frelease-0.3.1;p=backups%2F.git

Merging release-0.2.1
---

f2aa1e01ae0f1b0ea9354f2ea2c7444b5efc8ac5