# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110201102728-\ # tbgbx14amhbrgi01 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: 666192b32f6f3bd51cc9bbe35ea08541c1a79158 # timestamp: 2011-02-01 11:27:33 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: ole.john.aske@oracle.com-20110201094341-\ # ec5xz0f68zp3ckcr # # Begin bundle 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 kinChIcmxNUo