From: Carl N Baldwin <cnb@hpsvcnb.fc.hp.com>
Date: Tue, 25 Oct 2005 22:14:53 +0000 (-0600)
Subject: Merge branch 'master' of home:dvl/backup
X-Git-Tag: release-0.4~65
X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=commitdiff_plain;h=332895f51c79faba592e57ae32363d8c597eb0e1;hp=332895f51c79faba592e57ae32363d8c597eb0e1;p=backups%2F.git

Merge branch 'master' of home:dvl/backup
---