Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 17:20:43 +0000 (19:20 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 10 May 2011 17:20:43 +0000 (19:20 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge