Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Nov 2010 23:14:47 +0000 (00:14 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 17 Nov 2010 23:14:47 +0000 (00:14 +0100)
Conflicts:
make.sh


Trivial merge