Merge branch 'dm6'
authorZygo Blaxell <zblaxell@faye.furryterror.org>
Fri, 14 May 2010 16:57:42 +0000 (12:57 -0400)
committerZygo Blaxell <zblaxell@faye.furryterror.org>
Fri, 14 May 2010 16:57:42 +0000 (12:57 -0400)

Trivial merge