added merge handling code
added merge handling code

rpelisse/JGroups,slaskawi/JGroups,dimbleby/JGroups,danberindei/JGroups,pruivo/JGroups,dimbleby/JGroups,kedzie/JGroups,Sanne/JGroups,TarantulaTechnology/JGroups,ligzy/JGroups,rhusar/JGroups,rpelisse/JGroups,deepnarsay/JGroups,pruivo/JGroups,kedzie/JGroups,belaban/JGroups,vjuranek/JGroups,belaban/JGroups,pferraro/JGroups,ibrahimshbat/JGroups,pferraro/JGroups,rvansa/JGroups,ibrahimshbat/JGroups,belaban/JGroups,dimbleby/JGroups,kedzie/JGroups,Sanne/JGroups,vjuranek/JGroups,Sanne/JGroups,tristantarrant/JGroups,ligzy/JGroups,pruivo/JGroups,danberindei/JGroups,deepnarsay/JGroups,TarantulaTechnology/JGroups,slaskawi/JGroups,vjuranek/JGroups,TarantulaTechnology/JGroups,ibrahimshbat/JGroups,slaskawi/JGroups,rhusar/JGroups,rhusar/JGroups,pferraro/JGroups,ibrahimshbat/JGroups,rvansa/JGroups,danberindei/JGroups,ligzy/JGroups,rpelisse/JGroups,tristantarrant/JGroups,deepnarsay/JGroups