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

commit d5805446c7cee7690d3cb3958c7121fe9b6cc6c1
parent b152fbc9b15ba0ac5456af25542bd26b4a16d49f
Author: Dan Stillman <dstillman@zotero.org>
Date:   Mon,  7 Jul 2008 15:12:42 +0000

Recorded merge of revisions 2977 via svnmerge from 1.0 branch

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