sleuthkit/autopsy — pull request #660 by mrtizmo (2014-04-22 13:53:01+00:00)
Title: Corecomponents - Added NON-NLS comment tags

Fixed merge conflict.