From: Frank Lahm <franklahm@googlemail.com>
Date: Mon, 6 Jun 2011 07:40:59 +0000 (+0200)
Subject: Merge sf/master
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=netatalk.git;a=commitdiff_plain;h=9aac0301d44259f19d48037074aedff8f520721b

Merge sf/master
---

9aac0301d44259f19d48037074aedff8f520721b