Merge commit 'ms/ppp-update'
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Jul 2010 20:53:59 +0000 (22:53 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 5 Jul 2010 20:53:59 +0000 (22:53 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge