# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20110317124915-9gyau48qebnytp07 # target_branch: file:///home/rl136806/mysql/repo/mysql-trunk/ # testament_sha1: a682843305aebb9da787b21f032f8490f513350a # timestamp: 2011-03-17 13:49:37 +0100 # base_revision_id: tor.didriksen@oracle.com-20110317114804-\ # kmx03y74jr26gp9i # # Begin bundle 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