Merge branch 'maint'

Conflicts:

	Makefile.in
	NEWS
	web/index.in.html

diff --cc Makefile.in
index a24ba6bae03256033d394119dec43e02550b6b7d,d04d0ea3f2ad2a013d86b2454baeba4c9844d98d..f1cf1e40640a8347ae78edb0d7c9759b87716d17
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -14,7 -13,7 +14,7 @@@ build_date := $(shell date
  uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
  uname_rs := $(shell uname -rs)
  cc_version := $(shell $(CC) --version | head -n 1)
- codename := concurrent eternalty
 -codename := imaginary radiation
++codename := concurrent horizon
  
  DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
  DEBUG_CPPFLAGS += -Wredundant-decls

diff --cc NEWS
index 9d9530092caf6ff162b6467212337de186045745,66ce1f3fa8102c733bb77257388e7867ed594a99..3f6ae4590bf5febd511f5b71cebd635b12512a5c
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,15 -1,9 +1,15 @@@
  NEWS
  ====
  
- ------------------------------------------
- 0.3.6 (to be announced) "cubic continuity"
- ------------------------------------------
 +----------------------------------------------
 +0.4.1 (to be announced) "concurrent eternalty"
 +----------------------------------------------
 +
 +      - wma support
 +
+ -------------------------------------
+ 0.3.6 (2009-12-07) "cubic continuity"
+ -------------------------------------
  
  Quite a few bugs have been found and fixed since 0.3.5, so here's
  another 0.3.x release. No new features.

diff --cc web/index.in.html
index b685ac9d162d7c3eb8a5b2eb6a011c411ab74d9e,65b7f0ed6574f22ef4d8e1387c5a1056530bc45e..9c02c30b23094faa1b66ed0c8f54206291294042
--- 1/web/index.in.html
--- 2/web/index.in.html
+++ b/web/index.in.html
@@@ -1,10 -1,10 +1,14 @@@
  <h1>Events</h1>
  <hr>
  <ul>
+       <li>2009-12-07: <a href="versions/paraslash-0.3.6.tar.bz2">paraslash-0.3.6</a>
+               <a href="versions/paraslash-0.3.6.tar.bz2.asc">(sig)</a>
+               "cubic continuity"
+       </li>
 +      <li>2009-11-10: <a href="versions/paraslash-0.4.0.tar.bz2">paraslash-0.4.0</a>
 +              <a href="versions/paraslash-0.4.0.tar.bz2.asc">(sig)</a>
 +              "simultaneous independence"
 +      </li>
        <li>2009-09-21: <a href="versions/paraslash-0.3.5.tar.bz2">paraslash-0.3.5</a>
                <a href="versions/paraslash-0.3.5.tar.bz2.asc">(sig)</a>
                "symplectic separability"