# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101103091611-a3x9p0yivkvu5u9i # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 8f201d42bba3900189c5920b90f9df5635c786f0 # timestamp: 2010-11-03 11:16:22 +0200 # base_revision_id: sunny.bains@oracle.com-20101103014053-\ # rlghb3z1wfbc45al # # Begin bundle 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