From 7f0d7364efb2aaea82ebd31922f152f8fe5a14a9 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 4 May 2008 21:03:39 +0000
Subject: [PATCH] Recorded merge of already-integrated revisions
 2316,2451,2474,2491 via svnmerge from 1.0 branch