# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110215150230-\ # c9fvagc4u5incx9f # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-59415/ # testament_sha1: 3a367629a36ebaa2ea2776a9f0dc37ccceed4b60 # timestamp: 2011-02-15 16:02:34 +0100 # base_revision_id: dmitry.lenev@oracle.com-20110215135136-\ # inwybp4y3ng11ons # # Begin bundle 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