# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@oracle.com-20101005101745-\
#   8des9p1p4xa4zf2p
# target_branch: file:///Users/mattiasj/mysql-bzr/topush-trunk-\
#   bugfixing/
# testament_sha1: 1c58a59c108cfa049a8c572361cec807b3d5b048
# timestamp: 2010-10-05 12:50:48 +0200
# source_branch: file:///Users/mattiasj/mysql-bzr/b55784-trunk-bf/
# base_revision_id: alexander.nozdrin@oracle.com-20101002184354-\
#   eutx7eydu1me7aml
# 
# Begin bundle
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


