User: mwheinz Branch: DRUPAL-6--1 Date: Sat, 08 Jan 2011 04:17:18 +0000 Modified files: /modules/acidfree acidfree.module Log message: BKAT patches: fix extranous items being merged by _acidfree_object_merge and a bug when mass importing a local set of images that also has sub-directories. Links: http://cvs.drupal.org/diff.php?path=contributions/modules/acidfree/acidfree....