From e332912100ade88e6bdf4a727d3c7535dadf5e38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Mon, 18 Jun 2007 20:00:56 +0000
Subject: [PATCH] x

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21122 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 cf/ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cf/ChangeLog b/cf/ChangeLog
index 1985a8920..dc3bfba66 100644
--- a/cf/ChangeLog
+++ b/cf/ChangeLog
@@ -1,5 +1,7 @@
 2007-06-18  Love Hörnquist Åstrand  <lha@it.su.se>
 
+	* Makefile.am.common: Merge from samba config.
+
 	* Makefile.am.common (makedir-in-tree): depend on INFO_DEPS.
 
 	* valgrind-suppressions: Unknown suppression in runtime link