From 975e81afab0960403f9e57e1de2f2ede3002ff68 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 22 Jul 2008 05:42:16 +0000
Subject: [PATCH] Blocked revision 2988 from 1.0 branch via svnmerge