# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: martin.hansson@oracle.com-20110119143913-\
#   7ctrb0tgk43csqwa
# target_branch: file:///data0/martin/bzrroot/bug59173/t/
# testament_sha1: 018bb49ceceb87cac4b865c471e816283885c137
# timestamp: 2011-01-20 09:09:27 +0100
# source_branch: file:///data0/martin/bzrroot/bug59173/5.5/
# base_revision_id: bar@mysql.com-20110119133554-nsj8rbbrbhyoc71k
# 
# Begin bundle
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
oA==


