Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 18 Feb 2010 07:37:47 +0000 (08:37 +0100)
commite1731a7b19c19fe786bc6a428c08075fb2b9e9a5
tree4ab897a68170d278d6fbe84d5154c3d5d34c0400
parent0e717101e1bfce59e972b3c67ce460b48097e644
parentcc53e24c0f8968b17672b4103861cdf04d791ec3
Merge branch 'next' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x into next

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