# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110113083330-\ # q6jqxffv9d1syew0 # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # testament_sha1: 8f49f4efb7ca3d06b2f503262eab5df5d1a410e8 # timestamp: 2011-01-13 09:33:34 +0100 # base_revision_id: martin.hansson@oracle.com-20110113080721-\ # bu92czxpaw9nht9k # # Begin bundle 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 93K5PkHmF3JFOFCQ3XwYbw==