# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: georgi.kodinov@oracle.com-20110325153834-\ # b6l5moj9qeq5imbi # target_branch: file:///Users/kgeorge/mysql/work/B57648-ossl-trunk/ # testament_sha1: 82992a22afa8ad8b83944e8ffd1f3c621d7e8b13 # timestamp: 2011-03-25 17:38:40 +0200 # base_revision_id: marc.alff@oracle.com-20110310100809-\ # lqm9tmw5751grjmw # # Begin bundle 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 rEGod6sHFBiiidRP/i7kinChIdVKdAg=