From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 2 Mar 2009 20:58:20 +0000 (+0100)
Subject: Merge branch 'networking'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dfa56a8a55ec6272f89e40da49133fa5b9f906a;p=ipfire-3.x.git

Merge branch 'networking'

Conflicts:
	src/rootfiles/core/initscripts
---

8dfa56a8a55ec6272f89e40da49133fa5b9f906a