# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100812095158-zpsmseyksckr6uho # target_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugfixing-\ # merge/ # testament_sha1: 543cf441ba907c8a2588b7ca5e8138bdce77bdc7 # timestamp: 2010-08-12 03:52:04 -0600 # base_revision_id: jonathan.perkin@oracle.com-20100810140604-\ # wdp3t6f52yxktbml # # Begin bundle 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 wtSo1gvAF/4u5IpwoSElJ2uM