# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20110119145533-\ # y2giknbe0b96711o # target_branch: file:///export/home/didrik/repo/trunk-sortaborted/ # testament_sha1: f59a2acdae097a225fdc12e3250201fcd1b5d604 # timestamp: 2011-01-19 15:55:37 +0100 # base_revision_id: bar@mysql.com-20110119133554-nsj8rbbrbhyoc71k # # Begin bundle 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 O1ulKQeS9lyusSthnffLZLQ/xdyRThQkAFzG7YA=