# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20110404143442-yr2qiakzktqg181g
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/
# testament_sha1: 52bd0b602a59a7f3d5fd67c750c0cff2026a1c17
# timestamp: 2011-04-04 16:35:01 +0200
# base_revision_id: luis.soares@oracle.com-20110325121556-\
#   i43pocn444hkvbmw
# 
# Begin bundle
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
YV6g


