From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 27 Dec 2010 00:26:24 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb83db38d50a50f248f1cf1e6a3bd8d0a01ddfa2;p=ipfire-3.x.git

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x

Conflicts:
	pkgs/core/kernel/config
---

cb83db38d50a50f248f1cf1e6a3bd8d0a01ddfa2