# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: dao-gang.qu@sun.com-20091123084240-p36ev7itmflgm0rq # target_branch: file:///home/daogangqu/mysql/bzrwork/bug42851/mysql-\ # 5.1-bugteam/ # testament_sha1: 1e2b522eb0d2f8583c9c75b21354ad91a65ef5ce # timestamp: 2009-11-23 16:43:01 +0800 # base_revision_id: davi.arnaut@sun.com-20091103181844-\ # 4zfm2j149rypot06 # # Begin bundle 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 2rWsy4HOuQCE+6VRPtqNFeAn/xdyRThQkHJN27c=