# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: serg@mysql.com-20090504205105-2nga1085y9a5bgsf # target_branch: file:///usr/home/serg/Abk/mysql/6.0-maria/ # testament_sha1: 8bdedde5e3abfd1dd2c28e71d273115213bc845b # timestamp: 2009-05-04 22:51:36 +0200 # source_branch: bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-\ # 6.0-maria/ # base_revision_id: serg@mysql.com-20090504171438-12grpdfi138cpfo0 # # Begin bundle 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 kGPAsXo=