Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:51:31 +0000 (18:51 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:51:31 +0000 (18:51 +0200)
commit00269c4c8c235aaaa86ebea41e1b42d27b880c97
tree5b7f0c3810446e762764ecb79c927fcb0329126e
parent1afed8d21d28aa498beef8fb29932754259eb556
parentdc84620f4aaf3e272bedb993c11f7175a7e6c968
Merge branch 'master' into next

Conflicts:
make.sh
make.sh