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

Merge master
---

7a0ae384873e9920d676960302636eba27ad01c6