Merge branch 'PHP-5.4'

* PHP-5.4:
  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 ext/mysqlnd/mysqlnd.h
index 43aee6246a8114dd48a15c600ad648eca55a18ff,b0b3b15c693b7f6aeb3aa66b646fee339f175e39..c32ac7219379d2e738f4da8a7a4ced5c79675338
--- 1/ext/mysqlnd/mysqlnd.h
--- 2/ext/mysqlnd/mysqlnd.h
+++ b/ext/mysqlnd/mysqlnd.h
@@@ -22,7 -22,7 +22,7 @@@
  #ifndef MYSQLND_H
  #define MYSQLND_H
  
- #define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Revision$"
 -#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Id$"
++#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Id$"
  #define MYSQLND_VERSION_ID 50010
  
  #define MYSQLND_PLUGIN_API_VERSION 1