# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@oracle.com-20110209152204-5v71yjz021ynf81f
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/
# testament_sha1: 94fd60c38e0a97eccc5d150886471601daf3ce49
# timestamp: 2011-02-09 16:22:14 +0100
# base_revision_id: john.embretsen@oracle.com-20110209101905-\
#   mmuq9b2ifgjxthj2
# 
# Begin bundle
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
7+iv5RUC7kinChIVWPI34A==


