* src/Merge/_MergePerson.py: properly merge notes svn: r7163
svn: r7077
* various: pyflakes fixes svn: r6992
svn: r6824
* src/Merge/_MergeSource.py: broken out of MergeData.py * src/Merge/__init__.py: support of module * src/Merge/Makefile.am: added * src/Merge/_MergePlace.py: broken out of MergeData.py * src/Merge/_MergePerson.py: renamed svn: r6778