From: Carl Baldwin <cnb@ball.(none)>
Date: Wed, 26 Oct 2005 01:37:21 +0000 (-0600)
Subject: Merge refs/heads/master from origin
X-Git-Tag: release-0.4~61
X-Git-Url: http://git.pippins.net/embedvideo/.git/images/static/checkmark.gif?a=commitdiff_plain;h=7c962b0ad5636ad286132aaeda3badac76ceeace;p=backups%2F.git

Merge refs/heads/master from origin
---

7c962b0ad5636ad286132aaeda3badac76ceeace