sync diff of branches
upgraded to ext/mongo 1.2.6
reenabled for PHP 5.4

Conflicts:
	build-php.pl
uploadprogress 1.0.3.1
sync of branch diffs