From a087963578b29e7360564e87d7ba703eabbd6487 Mon Sep 17 00:00:00 2001
From: Michael Foord <fuzzyman@voidspace.org.uk>
Date: Sat, 20 Mar 2010 15:42:52 +0000
Subject: [PATCH] Block revision 79132 in preparation for a manual merge.

-- 
2.47.3