mergemaster.sh revision 878c6432
1