# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100826005928-up5sxyz76l2gijha # target_branch: file:///home/malff/BZR_TREE/mysql-5.5-bugfixing-\ # 55873/ # testament_sha1: 95fb9a467ab426b040da5e8c283bed4268c63d9d # timestamp: 2010-08-25 18:59:33 -0600 # base_revision_id: jon.hauglid@oracle.com-20100823154253-\ # yqsa2ybxkg8f5vwc # # Begin bundle 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 elw=