Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:41:31 +0000 (18:41 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 27 Jul 2011 16:41:31 +0000 (18:41 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge