# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20100922081541-mpy5ty4vmw0k5j19 # target_branch: file:///export/home/x/mysql-5.5-runtime-bug56494/ # testament_sha1: cda4dae10fa139f3969920706e79415ee5b40327 # timestamp: 2010-09-22 10:15:45 +0200 # source_branch: file:///export/home/x/mysql-5.5-bugfixing/ # base_revision_id: jon.hauglid@oracle.com-20100916141629-\ # tg3u8bsp1v9p7r7g # # Begin bundle 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