# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20110513134431-v3y2t88tzgsrgn0g # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bug11766111/ # testament_sha1: eeac5b7e2683d3632aec23e94346d40d20e4f516 # timestamp: 2011-05-13 15:44:37 +0200 # base_revision_id: bjorn.munch@oracle.com-20110513115802-\ # 6z0pqy6wm04e73jb # # Begin bundle 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 TQiw