Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Oct 2010 19:37:44 +0000 (21:37 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sat, 30 Oct 2010 19:37:44 +0000 (21:37 +0200)
commit57e682114e87ea9ed4cc419aea17dfd63cf3917b
tree740ee7789c09584d58e6472c82678f40c5f82c2e
parent933377600e8230e688cd760d031af538c2f4c8bf
parent4b8ede3119e17390a0ca799f39ef31d6bdfb1905
Merge commit 'origin/master' into next

Conflicts:
make.sh
make.sh