From db0a9b37b66fb45923fc9cd96b41d72f443f34e1 Mon Sep 17 00:00:00 2001
From: Christian Heimes <christian@cheimes.de>
Date: Thu, 31 Jan 2008 18:04:10 +0000
Subject: [PATCH] svnmerge.py block -r60480