# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dmitry.shulga@oracle.com-20110204051109-\ # 7enmofxh2vnpdmox # target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/ # testament_sha1: 19c7752b3f0e5517dc06c7a7ad359bff27f7274e # timestamp: 2011-02-04 11:12:08 +0600 # source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/ # base_revision_id: tor.didriksen@oracle.com-20110203135102-\ # 4rjgomp399lulbk2 # # Begin bundle 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 Su1M5WGhMU3ycubfpUpX/F3JFOFCQiwcefw=