# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20100803213406-rraa5eswlucjg4l6 # target_branch: file:///home/cpowers/work/dev/base-wl4896/mysql/ # testament_sha1: 0619e0f5de8a9c08f0ce94b75ea0d2a6eeeb3125 # timestamp: 2010-08-03 16:34:11 -0500 # source_branch: bzr+ssh://cpowers@bk-internal.mysql.com/bzrroot\ # /server/mysql-next-mr/ # base_revision_id: chris.powers@oracle.com-20100803211419-\ # 1iswz2qm86lszd2x # # Begin bundle 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