# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marko.makela@oracle.com-20101004100641-40dra6o08a1bfis7 # target_branch: file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ # testament_sha1: 56389451e93b671d73159a6661b8527796313399 # timestamp: 2010-10-04 13:08:26 +0300 # base_revision_id: vasil.dimov@oracle.com-20101004094958-\ # ji3oelbovdwafra5 # # Begin bundle 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 uSKcKEhER36pAA==