# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: bjorn.munch@oracle.com-20100930105109-0a5a2rpttaauovx1 # target_branch: file:///home/bm136801/my/mtr-tr/ # testament_sha1: fb13255bbdbd37aa39b881d8cb9c561ac5c52372 # timestamp: 2010-09-30 12:51:48 +0200 # source_branch: file:///home/bm136801/my/mysql-trunk/ # base_revision_id: bjorn.munch@oracle.com-20100929111728-\ # 8qvsupp6wo0gv4od # # Begin bundle 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