Author: vorlon Date: 2007-11-21 18:11:33 +0000 (Wed, 21 Nov 2007) New Revision: 1588 Modified: trunk/samba/debian/ Log: no longer use the "mergeWithUpstream" property Property changes on: trunk/samba/debian ___________________________________________________________________ Name: mergeWithUpstream - 1