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

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