From: Frank Lahm <franklahm@googlemail.com>
Date: Wed, 15 Dec 2010 11:47:54 +0000 (+0100)
Subject: Merge master
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=c73d2fc78e3e4513c1f00178016151ca072906a0

Merge master
---

c73d2fc78e3e4513c1f00178016151ca072906a0