# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20100819084049-cm6uzvz7xolvutf4 # target_branch: file:///home/rl136806/mysql/repo/mysql-next-mr-opt-\ # team/ # testament_sha1: 6aab0e17cc3c3b25ca1b35901dd65e9ab4714d0e # timestamp: 2010-08-19 10:41:35 +0200 # source_branch: file:///home/rl136806/mysql/repo/mysql-work5/ # base_revision_id: epotemkin@mysql.com-20100815094459-\ # gii96csphtx0tk1y # # Begin bundle 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 oSGbV824