# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: roy.lyseng@oracle.com-20100804070547-5hwfhjy0efes4y02 # target_branch: file:///home/rl136806/mysql/repo/mysql-work2/ # testament_sha1: 46b0a9cfabb50fc0f5e037036363f04db4e7e60c # timestamp: 2010-08-04 09:07:55 +0200 # base_revision_id: roy.lyseng@oracle.com-20100730073220-\ # 4ftoia6pm7120ehc # # Begin bundle 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