Add a property to merge the debian directory with the tarball from upstream
Authored by: mooch 2006-10-17
Parent: [r3955]
Child: [r3957]
