# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20101210150025-\ # xpi8jizo6f6hzc7n # target_branch: file:///export/home/didrik/repo/next-mr-opt-team-\ # wl1393-merge/ # testament_sha1: e996e0573245778ebfdd4e9f1b1a43f85e963638 # timestamp: 2010-12-10 16:00:31 +0100 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # next-mr-opt-team/ # base_revision_id: tor.didriksen@oracle.com-20101209115439-\ # 5o7wqmgguqthpzet # # Begin bundle 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