mergemaster.sh revision 335a3512
1