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)
commite2929cde1203ebeb194264bb7d7b9ca4e484e525
tree2e094c0fcdc988cfb562efff840b63bd959cf147
parent49eb9fd456f4b32bbf61202ac198243ea8c12e7d
parent3a3940b78e535ec0acc2d0308f8caf1e27234430
Merge commit 'origin/master' into next

Conflicts:
make.sh