fix merge conflicts
authorJan Pospíšil <honik@ntc.zcu.cz>
Wed, 17 Oct 2007 07:57:45 +0000 (07:57 +0000)
committerJan Pospíšil <honik@ntc.zcu.cz>
Wed, 17 Oct 2007 07:57:45 +0000 (07:57 +0000)
commit8457e69b529026637357b5aed0f2f3adf20ef4e0
tree1595979470c041ce20806d375c62a027d6093140
parent32fdabea71ed02d456693532494fcfedd0a3bacb
fix merge conflicts
org.glite.lb.common/src/context.c