Merge remote-tracking branch 'origin/next' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Aug 2012 10:23:11 +0000 (12:23 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 22 Aug 2012 10:23:11 +0000 (12:23 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge