# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20090928133250-aanr39xj4mi1nmwk # target_branch: file:///home/daogangqu/mysql/bzrwork/bug45677/mysql-\ # 5.1-bugteam/ # testament_sha1: 79353458f0ec5c08acfed553f591b659c2efb58c # timestamp: 2009-09-28 21:34:17 +0800 # base_revision_id: li-bing.song@sun.com-20090928062419-\ # v40rklb7g178tjza # # Begin bundle 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