# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101117143723-aqf2r98qayhd86c8 # target_branch: file:///export/home/x/mysql-5.5-runtime-refactor/ # testament_sha1: 2814d3d0ac01b776a088e3e9d1d557a167361e24 # timestamp: 2010-11-17 15:37:27 +0100 # source_branch: file:///export/home/x/mysql-5.5-bugfixing/ # base_revision_id: jon.hauglid@oracle.com-20101116100012-\ # kxep9txz2fxy3nmw # # Begin bundle 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