# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@oracle.com-20110126230225-htfatb79ldpj5gjk # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 7673998b81bef718c935cfe7efd70dcedc24411a # timestamp: 2011-01-26 17:02:32 -0600 # source_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\ # wl5379/ # base_revision_id: chris.powers@oracle.com-20110126222641-\ # u18vgvsm81xcv7sy # # Begin bundle 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