# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20110502105709-fk3f0m6fqxqj024k # target_branch: file:///home/rl136806/mysql/repo/mysql-work3/ # testament_sha1: cfba93cb9c68c1789c64afa83aa21eb6e1c25338 # timestamp: 2011-05-02 12:57:42 +0200 # base_revision_id: tor.didriksen@oracle.com-20110428115516-\ # sy51s25lk29u48kg # # Begin bundle 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 8XckU4UJALl73BA=