From d5805446c7cee7690d3cb3958c7121fe9b6cc6c1 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 7 Jul 2008 15:12:42 +0000
Subject: [PATCH] Recorded merge of revisions 2977 via svnmerge from 1.0 branch