# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20110513160449-tvxpm0rohdv6nxy9
# target_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bug12552516/
# testament_sha1: a0ebca8c135b65a69ec72d73293d371a4db639f6
# timestamp: 2011-05-13 18:04:54 +0200
# base_revision_id: bjorn.munch@oracle.com-20110513110449-\
#   yrg2lnt4tqrqyfyd
# 
# Begin bundle
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
/i7kinChIZw7C4o=


