# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@oracle.com-20100830095444-\
#   ievkbrjo3n5y4se2
# target_branch: file:///data0/martin/bzr/bug51070/5.1bt/
# testament_sha1: 7bd467b86fefeb8fc63b4887c087ee5d38840b15
# timestamp: 2010-08-30 11:54:46 +0200
# base_revision_id: ramil@mysql.com-20100830080828-0n9frntipbxlxo6m
# 
# Begin bundle
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


