merge.c revision 8d3aa83d
1