# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20100826164402-qpuv0lhdtvgr5ax6 # target_branch: file:///home/cpowers/work/dev/mysql-trunk-\ # bugfixing/mysql/ # testament_sha1: 6f5fd4f85cc10dcbeaf702dab0d510e20bc479a1 # timestamp: 2010-08-26 11:47:42 -0500 # source_branch: file:///home/cpowers/work/dev/dev-55-bugfixing/mysql/ # base_revision_id: jon.hauglid@oracle.com-20100826151735-\ # h63yjr0li8fm4n95 # # Begin bundle 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