# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20100819071058-8rgwb329yoq2lqg3 # target_branch: file:///home/rl136806/mysql/repo/mysql-work5/ # testament_sha1: 3e9a2e1968dbf79172029fda605da15be6581552 # timestamp: 2010-08-19 09:11:23 +0200 # base_revision_id: epotemkin@mysql.com-20100814104152-\ # r4ghhxs82qbss3ob # # Begin bundle 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