Merge branch 'plans' into maint

* plans:
  plans: add the "PLANS" directory

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Conflicts:
	Makefile.am

diff --cc Makefile.am
index d868501f96f94f23d5b00834a759e7c8425fc844,50e6b9b43ea199b04cc82c996ca362a48b4bb757..3c40f27cbe610188cf16a37e5e6a8d9a61e9913f
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -69,7 -69,10 +69,8 @@@ EXTRA_DIST += 
    $(AUTOMAKESOURCES) \
    bootstrap.sh \
    GNUmakefile \
-   HACKING
 -  maint.mk \
 -  syntax-checks.mk \
+   HACKING \
+   PLANS
  
  # Make versioned links.  We only run the transform on the root name;
  # then we make a versioned link with the transformed base name.  This