# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tor.didriksen@oracle.com-20110223085224-\ # hrj41sd3q4ctjuqw # target_branch: file:///export/home/didrik/repo/trunk-thdinit-gtest/ # testament_sha1: 52d9672ec8db9be1663334f0ff5b8138e603fe5c # timestamp: 2011-02-23 09:52:28 +0100 # base_revision_id: alexander.barkov@oracle.com-20110223045307-\ # u316hqua4z5j86xe # # Begin bundle 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 hwp53wg=