Recorded merge of already-integrated revisions 2316,2451,2474,2491 via svnmerge from 1.0 branch - www - Unnamed repository; edit this file 'description' to name the repository.

commit 7f0d7364efb2aaea82ebd31922f152f8fe5a14a9
parent d6c3aa695e1d6c31639df1ef1719aaca797a4a09
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun,  4 May 2008 21:03:39 +0000

Recorded merge of already-integrated revisions 2316,2451,2474,2491 via svnmerge from 1.0 branch

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