# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101116151823-zfvza6jacgkk3g2o # target_branch: file:///export/home/x/mysql-5.5-runtime-refactor/ # testament_sha1: ca41997312c50632cffbbf8473a0335d96830a34 # timestamp: 2010-11-16 16:18: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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 JQf8XckU4UJBuH07kA==