Merge remote-tracking branch 'origin/next' into kernel-update
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Jun 2012 08:25:02 +0000 (10:25 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 2 Jun 2012 08:25:02 +0000 (10:25 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge