From: Julian Seward <jseward@acm.org>
Date: Mon, 17 Sep 2012 21:26:42 +0000 (+0000)
Subject: Commit some left-over merge metadata.
X-Git-Tag: svn/VALGRIND_3_8_1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a52608f15645a2947adec5e363ba2bb1212dda2f;p=thirdparty%2Fvalgrind.git

Commit some left-over merge metadata.


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