From: Carl N Baldwin <cnb@plane.localdomain>
Date: Sun, 27 Nov 2005 00:30:51 +0000 (-0700)
Subject: Merge up to alan's release
X-Git-Tag: release-0.4~14
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/%7Blink_ppi%7D?a=commitdiff_plain;h=30e31c8d36fd4b0e12ab99fdcba347089000b0a7;p=backups%2F.git

Merge up to alan's release
---

30e31c8d36fd4b0e12ab99fdcba347089000b0a7