This commit was manufactured by cvs2svn to create tag
'merge_2_1_to_3_0_after'.
Sprout from branch_3_0 2011-06-08 13:18:25 UTC Zdeněk Šustr <sustr4@cesnet.cz> 'Merge from branch_2_1 to branch_3_0, also for glite.jobid'
Cherrypick from branch_3_0 2011-06-08 12:12:06 UTC Zdeněk Šustr <sustr4@cesnet.cz> 'Merge from branch_2_1 to branch_3_0, take 1':
org.glite.lb.server/src/lb_proto.c
Delete:
org.glite.lb.emi-lb/Makefile
org.glite.lb.emi-lb/configure
org.glite.lb.emi-lb/project/ChangeLog
org.glite.lb.emi-lb/project/package.description
org.glite.lb.emi-lb/project/package.summary
org.glite.lb.emi-lb/project/version.properties