# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jorgen.loland@oracle.com-20110221103337-\ # n3fxx2j0ivoj7h7k # target_branch: file:///export/home/jl208045/mysql/mysql-trunk-59793/ # testament_sha1: 030b5b51e2437802456b9425a0e83a2df7690300 # timestamp: 2011-02-21 11:33:41 +0100 # base_revision_id: tor.didriksen@oracle.com-20110218113905-\ # q0in762tona442om # # Begin bundle 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 Zdnw