Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:17:10 +0000 (21:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 2 Oct 2011 19:17:10 +0000 (21:17 +0200)
commit84aed1ea54ea5e482d3e7dcd7075188062ae85b1
tree5b11cecbd17cd82c73a02bfadf5928f5827353ac
parent8fb6ecda94638e10b5607bddce2881d6e4b2ed17
parentfa0bb39f77d3e5bbb5e178dd911f2347d6356277
Merge commit 'origin/master' into next

Conflicts:
make.sh
make.sh