From: Zygo Blaxell <zblaxell@faye.furryterror.org>
Date: Fri, 14 May 2010 16:57:42 +0000 (-0400)
Subject: Merge branch 'dm6'
X-Git-Tag: dm6-0.20100514~5
X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=dupemerge;a=commitdiff_plain;h=e4974f1b5561c306f3e4acbe2d2fd3c94d2cbce8;hp=-c

Merge branch 'dm6'
---

e4974f1b5561c306f3e4acbe2d2fd3c94d2cbce8