diff --git a/lib/ChangeLog b/lib/ChangeLog
index f9aefd4e64..514e9cfa66 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-20  Martin Vermeer <martin.vermeer@tkk.fi>
+
+	* layouts/egs.layout: add flag ProvidesNatbib 1
+
 2007-02-07  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* kbd/european.kmap: big update from Jacek M. Holeczek.
@@ -78,6 +82,7 @@
 	* Makefile.am (dist_examples_DATA): 
 	* examples/gl_splash.lyx: new file from José Ramom Flores d'as Seixas.
 	
+>>>>>>> .r17491
 2006-09-27  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* CREDITS:
diff --git a/src/ChangeLog b/src/ChangeLog
index e9ec38080e..8c0e5b80cf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-20  Martin Vermeer <martin.vermeer@tkk.fi>
+
+	* bufferparams.[Ch]: move getEngine() here, and let it sense the
+	provides(natbib) flag
+
 2007-03-19  Bernhard Roider  <bernhard.roider@sonnenkinder.org>
 
 	* toc.C (outline): fix bug where moving the last section up in the
diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 212dee30b1..028ce4ec4b 100644
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20  Martin Vermeer <martin.vermeer@tkk.fi>
+
+	* ControlBibtex.C:
+	* ControlCitation.C: correct getEngine() call
+	* biblio.[Ch]: remove old getEngine()
+
 2006-11-13  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* ControlAboutlyx.C (getCopyright): update dates
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index faa58981b8..f3d26ac674 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-20  Martin Vermeer <martin.vermeer@tkk.fi>
+
+	* insetcite.C: call getEngine()
+
 2007-01-31  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* insetbibtex.C (latex): copy the .bst files to the temp