# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mayank.prasad@oracle.com-20110510182649-\ # 8i8xz73zlm79h70o # target_branch: file:///home/mayank/mysql-tree/mysql-trunk-wl5767/ # testament_sha1: 6344491f355d22422e71ec0c7c4fb6b89b0ea0cf # timestamp: 2011-05-10 23:57:01 +0530 # base_revision_id: marc.alff@oracle.com-20110505035915-\ # o5yvvkt1vyvt7drg # # Begin bundle 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