Index: branches/1.1/NEWS
===================================================================
--- branches/1.1/NEWS	(revision 247)
+++ branches/1.1/NEWS	(revision 255)
@@ -31,4 +31,6 @@
 
 Others:
+ * fix build on rare arch
+ * fix build on Mac OS X
  * kill compiler warnings
  * zts build
@@ -37,4 +39,9 @@
 ChangeLog
 ========
+ * merged from trunk: 159,161-162,167-180,182,184,186-187,194
+   * [194] PHP_5_2: new element in zend_brk_cont_element
+   * [186] [187] fix build on some rare arch
+   * [184] fix tplcov
+   * [178] fix type processor_t conflict with Mac OS X
  * remove redundant open_basedir check, it's done before compiling
  * trick in_compilation state, don't trigger __autoload at compile time