From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 6 Nov 2010 22:14:47 +0000 (+0100)
Subject: Merge remote branch 'stevee/netplugd' into netplugd
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fnetplugd;p=people%2Fms%2Fipfire-3.x.git

Merge remote branch 'stevee/netplugd' into netplugd
---

8dce07fcc91d3e7fb30e10500c2df314c3d93000