# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20101216091402-40lxrnkmqnpgepmk # target_branch: file:///export/home/x/mysql-5.5-bugteam-bug58730/ # testament_sha1: b57c1dd043e4c00df36de499d27a3adaae41b1a9 # timestamp: 2010-12-16 10:14:07 +0100 # source_branch: file:///export/home/x/mysql-5.1-bugteam/ # base_revision_id: davi.arnaut@oracle.com-20101215225921-\ # xrma7cdmpu2jbo05 # # Begin bundle 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