AA: netatalk: merge r35198