From a52608f15645a2947adec5e363ba2bb1212dda2f Mon Sep 17 00:00:00 2001
From: Julian Seward <jseward@acm.org>
Date: Mon, 17 Sep 2012 21:26:42 +0000
Subject: [PATCH] Commit some left-over merge metadata.

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_8_BRANCH@12992
-- 
2.47.2