From fafa27195a4bc98eb633607e1c9e89e0ba09c1a0 Mon Sep 17 00:00:00 2001
From: Rob Siemborski <rjs3@andrew.cmu.edu>
Date: Wed, 19 Nov 2003 16:45:26 +0000
Subject: [PATCH] update to 2.1.16

---
 cyrus/Makefile.in    |  4 ++--
 cyrus/imap/version.h | 10 +++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/cyrus/Makefile.in b/cyrus/Makefile.in
index 2ea2042142..d979f03a37 100644
--- a/cyrus/Makefile.in
+++ b/cyrus/Makefile.in
@@ -1,5 +1,5 @@
 # Top-level Makefile for cyrus software
-# $Id: Makefile.in,v 1.66.2.1 2003/10/28 16:52:14 rjs3 Exp $
+# $Id: Makefile.in,v 1.66.2.2 2003/11/19 16:45:26 rjs3 Exp $
 #
 # @configure_input@
 # 
@@ -58,7 +58,7 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 cyrus_prefix = @cyrus_prefix@
 
-VERSION = 2.1.15
+VERSION = 2.1.16
 
 all:: 
 	@for d in  $(SUBDIRS); \
diff --git a/cyrus/imap/version.h b/cyrus/imap/version.h
index 5cf64044f9..60d3b6c6b7 100644
--- a/cyrus/imap/version.h
+++ b/cyrus/imap/version.h
@@ -36,11 +36,10 @@
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
  * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * $Id: version.h,v 1.128 2003/10/22 18:50:09 rjs3 Exp $
+ * $Id: version.h,v 1.126.2.1 2003/11/19 16:45:28 rjs3 Exp $
  */
 
-#define _CYRUS_VERSION "v2.2.1-BETA"
+#define _CYRUS_VERSION "v2.1.16"
 
 /* EXTRA_IDENT is a hack to add some version information for which compile
  * was used to build this version (at CMU, but we don't care what you do with
@@ -57,10 +56,7 @@
 #define CAPABILITY_STRING "IMAP4 IMAP4rev1 ACL QUOTA LITERAL+ " \
 	"MAILBOX-REFERRALS NAMESPACE UIDPLUS ID " \
 	"NO_ATOMIC_RENAME UNSELECT " \
-	"CHILDREN MULTIAPPEND BINARY " \
-	"SORT THREAD=ORDEREDSUBJECT THREAD=REFERENCES " \
-	"ANNOTATEMORE"
-
+	"CHILDREN MULTIAPPEND SORT THREAD=ORDEREDSUBJECT THREAD=REFERENCES"
 
 /* Values for ID processing */
 enum {