Merge branch 'refactoring2' of github.com:zendtech/php into refactoring2

Conflicts:
	ext/standard/formatted_print.c

diff --cc ext/standard/basic_functions.c
Simple merge

diff --cc ext/standard/file.c
Simple merge

diff --cc ext/standard/formatted_print.c
Simple merge

diff --cc ext/standard/var.c
Simple merge