* PHP-5.4:
  Updated NEWS for #67693
  Fixed bug #67693 - incorrect push to the empty array

Discussion: http://news.php.net/php.cvs/76836

You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().

When Wincache or APC are installed, the resource IDs are not the same.
This is because Wincache takes a few resource objects for itself.  As a
result, these tests become false positives.

On Windows boxes, the microtime precision is not granular enough
to reliably register a difference if two calls to uniqid() are made
concurrently.  This is a fix to the uniqid() test to avoid the false
positive when run on Windows machines.  Also, added a test to exercise
the 'more_entropy' variant of uniqid().

* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c