# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20110606204217-bonh0dct1gn2i3x4 # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: a7ca0de2f72a7db069b97e148dfcaa00b7dbca06 # timestamp: 2011-06-06 15:42:32 -0500 # source_branch: file:///home/cpowers/work/dev/mysql-trunk/ # base_revision_id: cpowers@tma-1-20110606195705-g1moftxfqlde495m # # Begin bundle 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