python 2.6 compatibility bugfix, make file merging optional.