# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20100823102854-t1clrojqis2ley36 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 3805fe8df61cee576dccaec3cbfdf9a1310b8ac9 # timestamp: 2010-08-23 13:29:11 +0300 # base_revision_id: sunny.bains@oracle.com-20100820074943-\ # 8w1yw2hnj8zztsu2 # # Begin bundle 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 TikQDU0AwAwgPq0EiXD9VgXckU4UJA8CJKsA