Corrected CVS conflict artifacts
Corrected CVS conflict artifacts

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