# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100826144124-atluv7026g02yri6 # target_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing-\ # 55873/ # testament_sha1: 5542d9b6bce6c5472a1d0af4e8222731cfe62a16 # timestamp: 2010-08-26 08:42:12 -0600 # base_revision_id: bar@mysql.com-20100826123633-8xh0dtfmaiha5w0u # # Begin bundle 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 8yFK2tlWdr5n/4u5IpwoSEuJbs6A