# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110513084706-\ # pvtoh89khrqkbulk # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0-spj-scan-scan/ # testament_sha1: 2a9b80cc155408bf68ca7cc902c37435e8b61f9f # timestamp: 2011-05-13 10:47:11 +0200 # source_branch: bzr+ssh://oaske@bk-internal.mysql.com/bzrroot/server\ # /mysql-5.1-telco-7.0/ # base_revision_id: ole.john.aske@oracle.com-20110513084341-\ # bxd2g0oprv0yfkzi # # Begin bundle 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