From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 18 Feb 2010 07:37:47 +0000 (+0100)
Subject: Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next
X-Git-Tag: v2.9-beta1~412^2~59
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=e1731a7b19c19fe786bc6a428c08075fb2b9e9a5

Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

Conflicts:
	doc/packages-list.txt
---

e1731a7b19c19fe786bc6a428c08075fb2b9e9a5