From a941d2df90cdfdff9169bc040964adb7022bc905 Mon Sep 17 00:00:00 2001
From: Eric Smith <eric@trueblade.com>
Date: Sun, 10 Feb 2008 15:09:40 +0000
Subject: [PATCH] Block r60713 with svnmerge.