From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 2 Mar 2011 10:35:41 +0000 (+0100)
Subject: Merge 2-1
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=85a8591621dc4c47417402a24df31e40bd7cae15

Merge 2-1
---

85a8591621dc4c47417402a24df31e40bd7cae15