Merge commit 'origin/next'
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Nov 2010 00:18:29 +0000 (01:18 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 27 Nov 2010 00:18:29 +0000 (01:18 +0100)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
Simple merge