merge

diff --cc VERSION
index 9252d5b18f5cc708c7b5946a52c21beeedc8e9de,1f3d544c164f05ad20b6d768e0102da002013c6f..31ba2101a1e06973c7ae319404ad80981620a3b0
--- 1/VERSION
--- 2/VERSION
+++ b/VERSION
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +v0.5p34
++=======
+ v0.5p32
++>>>>>>> c004486105922ebaf46798163458308d7f300d2c

diff --cc doc/install.texi
Simple merge

diff --cc doc/manual.texi
Simple merge