Author: frank Date: 2009-08-11 20:04:14 +0000 (Tue, 11 Aug 2009) New Revision: 4148 Modified: tex-common/branches/for-tl2008/debian/changelog tex-common/branches/for-tl2008/debian/control Log: add conflict as suggested on the list [For the full diff, use svn diff.]