# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101117124111-pfvsa8oxzr33l5gv # target_branch: file:///export/home/x/mysql-5.5-runtime-refactor/ # testament_sha1: f7de4f95ebdddff9a9182360ea68d740ac1f7022 # timestamp: 2010-11-17 13:41:15 +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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 D34zlUA=