# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: ole.john.aske@oracle.com-20110114082008-\ # 77kfco4xs4geosam # target_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-trunk/ # testament_sha1: 38fecc49c38b63da05bd643cd14a6109ef89d7c9 # timestamp: 2011-01-14 09:20:16 +0100 # source_branch: file:///net/fimafeng09/export/home/tmp/oleja/mysql\ # /mysql-5.5/ # base_revision_id: serge.kozlov@oracle.com-20110113213621-\ # 4qccnwyy72pxtnhh # # Begin bundle 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 /h2H//F3JFOFCQuqNufw