From: Zygo Blaxell <zblaxell@waya.furryterror.org>
Date: Sat, 9 Jan 2010 01:51:45 +0000 (-0500)
Subject: Merge branch 'performance'
X-Git-Tag: dm6-0.20100514~31
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=776aeabce8add0b31e16bb91b13e6cb9fcee682a;hp=776aeabce8add0b31e16bb91b13e6cb9fcee682a;p=dupemerge

Merge branch 'performance'

Conflicts:
	faster-dupemerge
---