# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: jon.hauglid@oracle.com-20110303111545-jdvccob39mbb0a48 # target_branch: file:///export/home/x/mysql-5.5-bug11755431/ # testament_sha1: 0a5e96e9f6dec0fcb4691cbe8f09cdc79854f1d4 # timestamp: 2011-03-03 12:15:49 +0100 # base_revision_id: alexander.barkov@oracle.com-20110303083041-\ # 7my9cadoq48gup0z # # Begin bundle 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