2014-09-02: merge stable into default.

merge stable into default.

diff --git a/.hgsigs b/.hgsigs
--- a/.hgsigs
+++ b/.hgsigs
@@ -10,3 +10,5 @@ a2ae0f4d637ff5d615acc91d82d21259b0ec3b94
 4e9a5aef2eb1307e082d4536afa5d4f47840b6ec 0 iQEcBAABAgAGBQJTIGw4AAoJEFyD82SnDaCeQw4IAKt5CZS8Jx4qyL3Zb8z0xjop461uDnEXyg0m+QL2fUgv3kpsZM5CqgZRm8mF3bnRTtmPwwvtD+mjkz+xCUhAWkqCMH+VusLnwfVAeOxAAvvXT+z8quh/Xt9qZ8J8VaWh6L1CrYl8xJFDJlymCe/2pcOn9OnWF3QeNuLswWllebGRXFHpeUs+JZKVxXhwSyGnfKOiboXfpkrW4VoyCuWR4Mz/KczohAj8dZYhD+gRjTUGLS64TJbaevmTnffexgqvM3KYj8hvwx4m1Iz95QLxcb09fRA9BoRPNvaOHUNMsPSlpoDEMI/pBBfWx0ALadaYTmJvG/jGeyYDCWQMAXUjMIs=
 a321c87fec27f184407da6a410c482a944074b7e 0 iQEcBAABAgAGBQJTw8CwAAoJEFyD82SnDaCeb/sH/374MNTwjx2LqBDAaK0jMHsFabm1/vZ99hlzNo0d7TPbl6/KkeicnluTpB+HVYtssMwHEFGiIWAY1xmX3rZKrYDpvCr2r15UZqqtyyeJxdDkqTQfsI7qwQy4FhZAfI9o948zYQ3z32TtsjPoyS6JDRZ1D0rBcU8/+K9AaYwl3QVsyxuvVwJK2Wb/Afn8CbG8xn0JtGNRbosfAAcgQDnV4MqA1p5MSDX3UaImWuVuBM9ejIvcyiBXxpwUb2DiEfFF8agsJoHQ/Vjy1j+IPE/mIa6nfV9I4Czb9wpItDXJe56wrsmGHEVVstnzys4DPiEWH57tG+iFgHXuw3gBJfySi2g=
 922c4eca67c5a4d01a584377d52aab3152a69564 0 iQEcBAABAgAGBQJT47YpAAoJEFyD82SnDaCefVUH/ioHISgEgJ7N0kWss+V3KMenaolt3GDTiUaR+ntzkdx0UmX48JcyMj3wgCeh1zMh76B/umJVqUAgB2Z/aw5nE654RRwMtE8EGZ1G9WvdArFG97GaGyWoJLHu4zzCPSKMT9PpACMWKR46jd7qKl7dcTL04Vd1oLJ6uV2+17SYRY222RKrgMH3CEcf5i457wEGb5qAM0T5Ap56SPrhsi+rBU7lPTtF2jKd5DJ8smIuwimHhE7JlHcl8/HzJICp1cJERRmV9ztfZxdpCIKpYpWByB7fNAjRiGo/pBq55TK9mAQ+ZqXYNtixMPtPdui+I1vhmjH/ZmWmKl6kD6x7Lm10Cgo=
+cd97a1e91fcdd700835270841a7e0d43a820eb02 0 iJwEAAEIAAYFAlQGH1QACgkQ3M8NswvBBUivrgP+MX9WKW2TYgEG1X/TKr/+mBpGmC/Ji8pX/nrD1gFv34Jcf+y2pm+zV8VMduHhc53AiLuT7FIZy0ZktqqFztHgxGwdVaVlaPg1jK4c4rKaIWPFvuRs8Vv+Cs7S913VJ6rd8x4E5GwAPbY+vyQ/Xw2gMuzw5VpuERwh+kRO1SooMqo=
+60707024df8a4e281791bca863552fcbaa3e534a 0 iJwEAAEIAAYFAlQGIGQACgkQ3M8NswvBBUimkgP/SXQY7JmLyRBJZNke3T9vfqj1vfNL2GSvRnRvWCetFtl6Uu4zt+nLrJOokuxGKPL6inJGhvB282vqAMu7CAPjk7XwJQr06tKsdoDwJOZ0JV1tgp7vP0L2mkCl5ClLA4d17hhuKITwr6PyXLBaCBrN51z1uFrJRv/ppKbL9QHtYAU=
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -18,3 +18,5 @@ 07ec05365e84d29d24ce5f476654f9542931ed2d
 9af37e8efa7a2674caec07c7d2339f136f380d37 wisp-mode-0.2
 5475d743562512c44d2cdd0bf534c78c88efb0f8 v0.6.0
 64745a296d569849de536000b636c100e3e0d30c v0.6.1
+7089c2ba36f5b3f1eeafde42be4ca4e4df1d6544 v0.6.2
+fc3d17fe770257a5e700c912844cee14668aa431 v0.6.3
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 wisp = wisp.scm language/wisp/spec.scm
-wisp_SOURCES = wisp-guile.w wisp-reader.w
+wisp_SOURCES = wisp-guile.w wisp-reader.w wisp-scheme.w
 EXTRA_DIST = $(wisp_SOURCES) $(wisp_DATA) bootstrap.sh wisp.py examples tests runtests.sh wisp-repl-guile.sh
 CLEANFILES = ${wisp} ChangeLog
 DISTCLEANFILES = ${CLEANFILES} @abs_top_builddir@/1 @abs_top_builddir@/2 @abs_top_builddir@/syntaxtests.sh
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl run `autoreconf -i` to generate a configure script. 
 dnl Then run ./configure to generate a Makefile.
 dnl Finally run make to generate the project.
-AC_INIT([wisp], [0.6.2],
+AC_INIT([wisp], [0.6.3],
         [arne_bab@web.de])
 # Check for programs I need for my build
 AC_CANONICAL_TARGET