diff --git a/ChangeLog b/ChangeLog
index 84900668e2667c0e916c563d3d2f084304b78cec..01445762d052e2845360a695c7a23c5de374db68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2003-08-06  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/SOLVER/src/cg.c:
+	When using a preconditioner terminate when the real residuum is below
+	the tolerance. "delta" only holds the residuum of P^{-1} (A x - b).
+
+2003-08-05  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/SOLVER/src/cg.c:
+	Only modify previous behaviour if precon != NULL.
+
+	* /net/sauron/graid/ALBERT_CVS/SOLVER/src/cg.c:
+	Stop when _real_ residuum is reached. The former behaviour was to stop
+	when the _preconditioned_ residuum was satisfying the prescribed
+	tolerance.
+
+2003-08-04  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/Makefile.am:
+	Install face_quad_fast.h
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/albert.h:
+	Fix c++ enum/typedef issue.
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/dof_admin.c:
+	Fix a typo.
+
+2003-08-01  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT23_1/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT23_11/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/adapt.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/albert.h, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/face_quad_fast.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/face_quad_fast.h, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/numint.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_2.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_3.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_4.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT22_0/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT22_01/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT22_1/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT22_11/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT23_0/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/ALBERT23_01/Makefile.am, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_4.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_0.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_1.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_2.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_3.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_4.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_0.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_1.c, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/albert.bib, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/examples.tex, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/graph-impl.tex, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/solve-impl.tex, /net/sauron/graid/ALBERT_CVS/ALBERT/doc/struct-func.tex, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_0.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_1.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_2.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_3.c, /net/sauron/graid/ALBERT_CVS/admin/ChangeLog:
+	Merge from main-trunk.
+
+	* /net/sauron/graid/ALBERT_CVS/admin/ChangeLog:
+	*** empty log message ***
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/adapt.c:
+	marking(): only use global refinement if adapt->err_sum > adapt->tolerance.
+
+	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_0.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_1.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_2.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_3.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/3d/lagrange_4.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/albert.h, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_1.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_2.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_3.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_4.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_0.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_1.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_2.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_3.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/2d/lagrange_4.c, /net/sauron/graid/ALBERT_CVS/ALBERT/src/1d/lagrange_0.c:
+	struct bas_fcts {}: new component "bary", array with barycentric
+	coordinates of maxima of the basis functions (i.e. the Lagrange-nodes
+	for Lagrange basis functions).
+
 2003-08-01  Claus-Justus Heine  <claus@mathematik.uni-freiburg.de>
 
 	* /net/sauron/graid/ALBERT_CVS/ALBERT/src/Common/adapt.c: