From: Frank Lahm <franklahm@googlemail.com>
Date: Tue, 16 Nov 2010 14:25:00 +0000 (+0100)
Subject: Merge from branch-2-1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=df4786e567fddb4b238f658d43e2662f488f73ba

Merge from branch-2-1
---

df4786e567fddb4b238f658d43e2662f488f73ba