From 86bc17944f4386b598d0d02dde0d7bc0a94274f5 Mon Sep 17 00:00:00 2001
From: Eric Smith <eric@trueblade.com>
Date: Fri, 22 Feb 2008 16:31:15 +0000
Subject: [PATCH] Block r60962 with svnmerge.

-- 
2.47.3