# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100714162321-v9yj1jv00ahezzmr # target_branch: file:///home/malff/BZR_TREE/mysql-trunk-bugfixing-\ # 55087/ # testament_sha1: f22c5fa051647155bbe9b717d2dde47c409ac3ff # timestamp: 2010-07-14 10:24:06 -0600 # base_revision_id: davi.arnaut@sun.com-20100713173432-\ # 6wwm8ynbhfm2jtt0 # # Begin bundle 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 P/xdyRThQkC5EhTQ