# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110504114533-\ # 24vvxlykib19nspb # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.1-telco-7.0/ # testament_sha1: 3fa00d8eba30790f3b0cf7c9ceb4d41dfa952138 # timestamp: 2011-05-04 13:45:38 +0200 # base_revision_id: jan.wedvik@sun.com-20110504093508-tdypno1edbt0di5d # # Begin bundle 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