Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Replace $Revision$ with $Id$ in keyword expansion enable files
  Enable $Id$ expansion for files with the $Revision$ keyword

Conflicts:
	ext/mysqlnd/mysqlnd.h

diff --cc README.input_filter
Simple merge

diff --cc ext/dba/libflatfile/flatfile.c
Simple merge

diff --cc ext/dba/libinifile/inifile.c
Simple merge

diff --cc ext/enchant/enchant.c
Simple merge

diff --cc ext/filter/filter.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd.h
index 11aea7a82d0015cc96684990c2dfc8e8943ba090,65fe78e70ce53d27a6cd578597722950e490b0d0..b0b3b15c693b7f6aeb3aa66b646fee339f175e39
--- 1/ext/mysqlnd/mysqlnd.h
--- 2/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@@ -22,10 -22,12 +22,10 @@@
  #ifndef MYSQLND_H
  #define MYSQLND_H
  
- #define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Revision$"
 -#define MYSQLND_VERSION "mysqlnd 5.0.8-dev - 20102224 - $Id$"
 -#define MYSQLND_VERSION_ID 50008
++#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Id$"
 +#define MYSQLND_VERSION_ID 50010
  
 -/* This forces inlining of some accessor functions */
 -#define MYSQLND_USE_OPTIMISATIONS 0
 -#define AUTOCOMMIT_TX_COMMIT_ROLLBACK
 +#define MYSQLND_PLUGIN_API_VERSION 1
  
  #define MYSQLND_STRING_TO_INT_CONVERSION
  /*

diff --cc ext/phar/phar.c
Simple merge

diff --cc ext/posix/posix.c
Simple merge

diff --cc ext/reflection/php_reflection.c
Simple merge

diff --cc ext/simplexml/simplexml.c
Simple merge

diff --cc ext/sysvmsg/sysvmsg.c
Simple merge

diff --cc sapi/continuity/capi.c
Simple merge

diff --cc sapi/nsapi/nsapi.c
Simple merge