# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@oracle.com-20110202220229-\ # gjfsy241scm9vram # target_branch: file:///Users/mattiasj/mysql-bzr/merge-trunk-wl5217/ # testament_sha1: cf0ef0525bee51ea122c6a9e6ea51aab68fbe830 # timestamp: 2011-02-02 23:02:45 +0100 # source_branch: file:///Users/mattiasj/mysql-bzr/mysql-trunk-wl5217/ # base_revision_id: mattias.jonsson@oracle.com-20110202214625-\ # ta01gsgois2ag72f # # Begin bundle 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