Merge branch 'release'

Conflicts:
	NEWS

Conflicts resolved by inserting the 0.10.2 stanza before 0.11

diff --cc Makefile.local
Simple merge

diff --cc NEWS
index 2b2f08a6b799d5ba51a5577fc0a1f44e0126f68e,3f577e4240c2dc09333bf254ccc1bab7e6fa8d08..bb5e4d55f6415a34c1e4a5231799bd62a3a14c7b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,16 -1,14 +1,27 @@@
 +Notmuch 0.11 (201x-xx-xx)
 +=========================
 +
 +Performance
 +-----------
 +
 +Automatic tag query optimization
 +
 +  "notmuch tag" now automatically optimizes the user's query to
 +  exclude messages whose tags won't change.  In the past, we've
 +  suggested that people do this by hand; this is no longer necessary.
 +
 +
+ Notmuch 0.10.2 (2011-12-04)
+ ===========================
+ 
+ Bug-fix release.
+ ----------------
+ 
+ Fix crash in python bindings.
+ 
+     The python bindings did not call g_type_init, which caused crashes
+     for some, but not all users.
+ 
  Notmuch 0.10.1 (2011-11-25)
  ===========================
  

diff --cc test/notmuch-test
Simple merge