conflict after merge
authorAleš Křenek <ljocha@ics.muni.cz>
Fri, 23 Mar 2007 13:01:18 +0000 (13:01 +0000)
committerAleš Křenek <ljocha@ics.muni.cz>
Fri, 23 Mar 2007 13:01:18 +0000 (13:01 +0000)
commit09d57a8fde316b5b868e42f3e5e4f40f6df57293
treec4e43076bcea9b1c4155b35563c4fe25d594d7ce
parent93edc4bd25506651e1fe08b69c5b5dbc8daf9e0d
conflict after merge
org.glite.lb.client-interface/Makefile