# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110620141256-\ # g2auznma0gkomdeq # target_branch: file:///export/home/jl208045/mysql/mysql-next-mr-opt-\ # backporting/ # testament_sha1: 16d061c462c62ed330e343c2c216dc6b70d0e760 # timestamp: 2011-06-20 16:13:07 +0200 # base_revision_id: jorgen.loland@oracle.com-20110615105048-\ # yhbq58b26glco915 # # Begin bundle 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