From: Julian Seward <jseward@acm.org>
Date: Sun, 2 Sep 2012 14:11:51 +0000 (+0000)
Subject: Commit merge info that should have been committed as part of r12931.
X-Git-Tag: svn/VALGRIND_3_8_1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c12b698d297d890ea7b1f4daf6eab4765bc9a84;p=thirdparty%2Fvalgrind.git

Commit merge info that should have been committed as part of r12931.


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