# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20101202163855-l2butojui8w863t0 # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-bugfixing-\ # merge/ # testament_sha1: a722d6004ef69a6850d5dbb7ecc203715319123e # timestamp: 2010-12-02 17:39:16 +0100 # source_branch: file:///Users/malff/BZR_TREE/mysql-5.5-bugteam/ # base_revision_id: marc.alff@oracle.com-20101202150507-\ # qy94l2o3dc1h6bcx # # Begin bundle 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