diff --git a/src/ChangeLog b/src/ChangeLog
index 66d303adc8..5a4a1d3cb4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-04-30  Herbert Voss  <voss@lyx.org>
+
+	* buffer.C (parseSingleLyXformat2Token): fix bug with ignored
+	"keep" option
+
 2002-05-29  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* lyxserver.C (callback): fix of lyxserver for gbib. Does not use
diff --git a/src/buffer.C b/src/buffer.C
index 6075470655..936b20ac68 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -1119,15 +1119,21 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
 	} else if (token == "\\added_space_top") {
 		lex.nextToken();
 		VSpace value = VSpace(lex.getString());
+		// only add the length when value > 0 or
+		// with option keep
 		if ((value.length().len().value() != 0) ||
+		    value.keep() ||
 		    (value.kind() != VSpace::LENGTH))
-		    par->params().spaceTop(value);
+			par->params().spaceTop(value);
 	} else if (token == "\\added_space_bottom") {
 		lex.nextToken();
 		VSpace value = VSpace(lex.getString());
+		// only add the length when value > 0 or
+		// with option keep
 		if ((value.length().len().value() != 0) ||
+		    value.keep() ||
 		    (value.kind() != VSpace::LENGTH))
-		    par->params().spaceBottom(value);
+			par->params().spaceBottom(value);
 #ifndef NO_COMPABILITY
 #ifndef NO_PEXTRA_REALLY
 	} else if (token == "\\pextra_type") {
diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index bd5fbe8b9d..157e56c295 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-31  Dekel Tsur  <dekelts@tau.ac.il>
+
+	* math_hullinset.C (ams): Do a real check.
+
 2002-05-28  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* math_xdata.C: 
diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 8e52adb9e0..ff8c14af24 100644
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -264,8 +264,6 @@ bool MathHullInset::numbered(row_type row) const
 
 bool MathHullInset::ams() const
 {
-	return true;
-/*
 	return
 		objtype_ == LM_OT_ALIGN ||
 		objtype_ == LM_OT_MULTLINE ||
@@ -273,7 +271,6 @@ bool MathHullInset::ams() const
 		objtype_ == LM_OT_ALIGNAT ||
 		objtype_ == LM_OT_XALIGNAT ||
 		objtype_ == LM_OT_XXALIGNAT;
-*/
 }
 
 
diff --git a/status.12x b/status.12x
new file mode 100644
index 0000000000..8d7b8540dc
--- /dev/null
+++ b/status.12x
@@ -0,0 +1,53 @@
+-*- text -*-
+I'd be glad if some of you could take the time to check it out (or fix
+a bug or two if you are feeling adventurous). Let me recall that all
+these fixes have been checked in the branch BRANCH-1_2_X, which you
+can get with the command
+  cvs checkout -d lyx-1_2_x -r BRANCH-1_2_X lyx-devel
+
+JMarc
+
+What's new
+==========
+
+** Updates
+
+- update finnish and danish localizations
+
+- update Tutorial to be more up to date
+
+- add new icon for buffer-new
+
+- update template for IEEEtran
+
+** Bugfixes
+
+- fix positionning of cursor after undo
+
+- save preamble too when using 'save as document defaults' in document
+  layout dialog
+
+- re-read correctly graphics insets when file name contains a comma
+
+- disable 'Load' button of 'include file' dialog for verbatim include
+
+- only use the amsmath package when it is needed
+
+- do not ignore zero-length vertical spacing with 'keep' flag.
+
+- fix interaction between sixpack and LyX via lyxserver
+
+- fix command line crash and give useful exit status on some errors
+
+- fix latex import when using --with-version-suffix configure flag
+
+- make latex import script (reLyX) honor the LYX_DIR_12x envirnment
+  variable, like the rest of LyX
+
+- honor --with-extra-XXX whensearching for AikSaurus library
+
+- fix support for alpha-based systems in boost library
+
+- improve compilation with compaq cxx 6.5 (not there yet...)
+
+- fix "FADE OUT:" style in hollywood layout