From c8dc421c5cad0f3296174b44f8deccfb69dec43f Mon Sep 17 00:00:00 2001
From: Jelte Jansen <jelte@isc.org>
Date: Fri, 9 Dec 2011 09:53:19 +0100
Subject: [PATCH] [master] changelog

---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d5849f0413..2583fdf0ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+340.	[build]		jelte
+	Fixed several linker issues related to recent gcc versions, botan
+	and gtest.
+	(Trac #1442, git 91fb141bfb3aadfdf96f13e157a26636f6e9f9e3)
+
 339.	[bug]		jinmei
 	libxfr, used by b10-auth to share TCP sockets with b10-xfrout,
 	incorrectly propagated ASIO specific exceptions to the application