Recorded merge of revisions 3301 from 1.0 branch via svnmerge - www - Unnamed repository; edit this file 'description' to name the repository.

commit a2e1a83de7dd813c4223db4108d69c811bf56f16
parent ee8229b80ad77cf20e7b80857c60906f87232f4d
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon,  1 Sep 2008 06:05:52 +0000

Recorded merge of revisions 3301 from 1.0 branch via svnmerge

	www Unnamed repository; edit this file 'description' to name the repository.
	Log \| Files \| Refs \| Submodules \| README \| LICENSE