Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:17:10 +0000 (21:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:17:10 +0000 (21:17 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
Simple merge