Merge branch 'master' into pakfire3
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 06:23:18 +0000 (08:23 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 06:23:18 +0000 (08:23 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge