# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110126132329-r1wyh235a3pi2n71 # target_branch: file:///export/home/x/mysql-5.5-bug42230/ # testament_sha1: 8d2661772dd27339f3af6876eaf114450e2f9fe8 # timestamp: 2011-01-26 14:23:32 +0100 # base_revision_id: alfranio.correia@oracle.com-20110126124409-\ # ldahnb0h3ezgbhuz # # Begin bundle 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 QRdW6UQ=