Update changes to reflect merges into 2.1.x branch

CHANGES

@@ -2,12 +2,6 @@
 ?? ??? 2007 - trunk
 -------------------
 
-* Add the PCRE_DOLLAR_ENDONLY option when compiling regular expression
-  for the @rx operator and variables.
-
-* Really set PCRE_DOTALL option when compiling the regular expression
-  for the @rx operator as the docs state.
-
 * Removed CGI style HTTP_* variables in favor of REQUEST_HEADERS:Header-Name.
 
 * Store filename/line for each rule and display it and the ID (if available)
@@ -25,6 +19,16 @@
   and/or counting operator in the debug log.
 
 
+04 Apr 2007 - 2.1.1-rc2
+-----------------------
+
+ * Add the PCRE_DOLLAR_ENDONLY option when compiling regular expression
+   for the @rx operator and variables.
+ 
+ * Really set PCRE_DOTALL option when compiling the regular expression
+   for the @rx operator as the docs state.
+
+
 11 Mar 2007 - 2.1.1-rc1
 -----------------------