# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100426135015-zn2wqhz0sdl22eep # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: 038ad7b5cf7b41008187bbad5376678321a1df7e # timestamp: 2010-04-26 07:50:58 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: alfranio.correia@sun.com-20100426092226-\ # bnkzpjs8uqkl7l16 # # Begin bundle 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