# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110216152619-h5rmvt1agkfxjtr3 # target_branch: file:///export/home/x/mysql-5.1-bug11752069/ # testament_sha1: 1cb82f03431059378ba8fe672f5b4014b61986b3 # timestamp: 2011-02-16 16:26:23 +0100 # base_revision_id: dmitry.lenev@oracle.com-20110215110305-\ # 23v66cenqyhgi6l6 # # Begin bundle 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 +myUIxAuJ7yB/8XckU4UJBJscQ2A