make logmerger read the new logfile packages
make it use directory paths if any filenames are identical
fix regex of server logs in logfile package
use meaningful filename for tempfile in merge result
make regex more readable
modification on regex based on changes in log collector
Merge remote branch 'origin/logtools'
Make yujie's logmerger fix 2.6 compatible.