--- Merging r29524 into '.':
U packages/zlib/src/zlib.pp
--- Recording mergeinfo for merge of r29524 into '.':
U .
--- Merging r29525 into '.':
G packages/zlib/src/zlib.pp
--- Recording mergeinfo for merge of r29525 into '.':
G .

# revisions: 29524,29525

git-svn-id: branches/fixes_3_0@31121 -