# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100413144628-zqxloilwwuvczx0l # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: cde58bea1b177a5bf3cd52a86f5b6ecdfe916e7d # timestamp: 2010-04-13 08:47:18 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: vvaintroub@mysql.com-20100413130933-\ # 2aqmpo25oruausbg # # Begin bundle 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 XWobc/jzk8P/F3JFOFCQsWDJvA==