# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100909160027-zvap9no52yu49rjt # target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\ # merge/ # testament_sha1: 1b5990af8a01ba6ac750f642fe79e0b4b6cdf3d0 # timestamp: 2010-09-09 10:00:55 -0600 # source_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing/ # base_revision_id: davi.arnaut@oracle.com-20100909130425-\ # 146jpttpt1nhaibh # # Begin bundle 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 JPWjF3TbgxPcg6SXnc+h//F3JFOFCQecqWBw