# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20110203050304-0mclq8kcrtximqy4 # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 66c9e276b2d161cedf7d85a5be5b8dc344d87275 # timestamp: 2011-02-02 23:03:12 -0600 # source_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\ # wl5379/ # base_revision_id: chris.powers@oracle.com-20110126230225-\ # htfatb79ldpj5gjk # # Begin bundle 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