Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:51:31 +0000 (18:51 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:51:31 +0000 (18:51 +0200)
Conflicts:
make.sh

1  2 
make.sh

diff --cc make.sh
Simple merge