Merge remote-tracking branch 'stevee/avahi-fixes' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:23:12 +0000 (20:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 20 Jan 2014 19:23:12 +0000 (20:23 +0100)

Trivial merge