# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: gshchepa@mysql.com-20090623100758-dl0u2rjayhwnxy42
# target_branch: file:///home/uchum/work/bzr/30946-5.1/
# testament_sha1: cddf921b850a64ff52fc4f292a27f2e69958c419
# timestamp: 2009-06-23 15:08:08 +0500
# base_revision_id: martin.hansson@sun.com-20090622140142-\
#   t735nplwp0yg9alg
# 
# Begin bundle
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
+O68AP9B/wP/F3JFOFCQinx00w==



