# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090929124131-70a7o3occ7rnqywk # target_branch: file:///home/daogangqu/mysql/bzrwork/bug46640/mysql-\ # 5.1-bugteam/ # testament_sha1: a353b16d396acf7b5f5043ee8cfb962bd21c9c4f # timestamp: 2009-09-29 20:42:57 +0800 # base_revision_id: joro@sun.com-20090918131958-2238vzh7ibvrolhc # # Begin bundle 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 kn/xdyRThQkLNCBgUA==