From: Frank Lahm <franklahm@googlemail.com>
Date: Thu, 9 Sep 2010 09:46:45 +0000 (+0200)
Subject: Merge from branch-2-1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=a6f112b04ce4f0d2eaf38b3298246a93e5b8de23

Merge from branch-2-1
---

a6f112b04ce4f0d2eaf38b3298246a93e5b8de23