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

author Arne Fitzenreiter <arne_f@ipfire.org>

Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
diff --cc doc/packages-list.txt
Simple merge
diff --cc make.sh
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
		1	2
doc/packages-list.txt	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history