# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101220125907-bwcvz39oxyfhq9i2 # target_branch: file:///export/home/x/mysql-trunk-bugfixing-bug53322/ # testament_sha1: 5555bd21a7e544be07e72d90e51d0bdcad93462c # timestamp: 2010-12-20 13:59:10 +0100 # source_branch: file:///export/home/x/mysql-5.5-bugteam/ # base_revision_id: bar@mysql.com-20101220102806-b7z0aayybfklvp0d # # Begin bundle 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