# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: epotemkin@mysql.com-20100825154617-j1w7do6pl4jcx1dg
# target_branch: file:///work/bzrroot/55204-bug-5.5-bugfixing/
# testament_sha1: 6acd6a89ad2f9987fdf7e9ed17db69cc5388a00a
# timestamp: 2010-08-25 19:46:21 +0400
# base_revision_id: alik@sun.com-20100816063826-5mc0z9rlz0176wvb
# 
# Begin bundle
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
kU4UJBBKYMQA


