Merge commit '0.6.1'

Conflicts:
	lib/Makefile.local

The conflicts are from three kinds of commits not merged into release:
    - typo fixes
    - removal of debug output
    - fix for CLEAN rule

That were never merged into the release branch.

1 files changed, 11 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index f3fefad1..bb58d6b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,14 @@
+Notmuch 0.6.1 (2011-07-17)
+==========================
+
+Bug-fix release.
+----------------
+
+Re-export Xapian exception typeinfo symbols.
+  
+  It turned out our aggressive symbol hiding caused problems for
+  people running gcc 4.4.5.
+
 Notmuch 0.6 (2011-07-01)
 =======================
 New, general features