From: Alan Jack Pippin Date: Mon, 7 Nov 2005 16:57:11 +0000 (-0700) Subject: Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/ X-Git-Tag: release-0.4~22 X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=2627a2ef3b9a158282133c143a417d99de4b2d66;p=backups%2F.git Merge branch 'master' of ecbaldwin.net:/home/cnb/dvl/backup/ --- 2627a2ef3b9a158282133c143a417d99de4b2d66