# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: zhenxing.he@sun.com-20100711120432-ck9lc417krhbyw5m # target_branch: file:///media/sdb2/hezx/work/mysql/bzr/b52704/5.1-\ # bugteam/ # testament_sha1: 7ace5024f9f9565dc6e831d3cfe21eca360a1608 # timestamp: 2010-07-11 20:04:43 +0800 # base_revision_id: svoj@sun.com-20100414115343-18bicqhz3vsxhh3q # # Begin bundle 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