From d2e5f49ba48c69e6d771a8f3d97e3706261347a2 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 27 Apr 2007 19:24:35 +0000
Subject: merge bugfix branch up to 2.6.4

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 8ad2462..12e78a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,12 +24,19 @@
 
 	* Replace utils/mount.fuse "sh" script with a "C" program
 
+2007-04-15  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Add -lulockmgr to compilation comment in fusexmp_fh.c
+
 2007-04-05  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Check for iconv.  Patch by Csaba Henk
 
 	* Add direct umounting
 
+	* Use "fusectl" as the device for the fusectl filesystem.  Debian
+	Bug#417945.  Reported by Laurent Bonnaud
+
 2007-04-01  Csaba Henk <csaba.henk@creo.hu>
 
 	* Fix some FreeBSD related macros.
-- 
cgit v1.2.3