code reformat
Merge branch 'master' of git://github.com/aimfeld/ZendDiCompiler
Merge branch 'master' into dependencies-removed

Conflicts:
	src/ZendDiCompiler/ZendDiCompiler.php