# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@oracle.com-20100503161332-vldypa4jy22rcnla # target_branch: file:///Users/malff/BZR_TREE/mysql-6.0-codebase-\ # bugfixing/ # testament_sha1: 0b4cf924eebfdbc0cff820a099e06770401aff76 # timestamp: 2010-05-03 10:13:54 -0600 # source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr-bugfixing/ # base_revision_id: tor.didriksen@sun.com-20100503114031-\ # 7acz50ku088n14yn # # Begin bundle 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 i49y6Oh8D5xJH2f7i7kinChIVotiIIA=