mergemaster.sh revision 15768c78
1