# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20100727082350-16rz63okiv26926v # target_branch: file:///home/rl136806/mysql/repo/mysql-work5/ # testament_sha1: 8d785b06ea3a689eafa2373a62bac2819f5227f2 # timestamp: 2010-07-27 10:24:23 +0200 # base_revision_id: epotemkin@mysql.com-20100726113407-\ # 97mj9zm97haxsf6t # # Begin bundle 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 kinChIBOI7iY