# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110321130621-\ # z8qov0yxvge0ae1r # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: c55e1c8c44b93163c7c495f380cefd38b6b0f60d # timestamp: 2011-03-21 14:06:29 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: georgi.kodinov@oracle.com-20110318145827-\ # q1t1vd16ptv09hzw # # Begin bundle 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 AUZ/8XckU4UJAfbjDYA=