Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 05:40:37 +0000 (07:40 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 12 Jul 2011 05:40:37 +0000 (07:40 +0200)
commit923ad92ac18cf39f93ca909faa3bac0505c09462
treef6a487a763e0a40ecc0365f150b8793b9f2d02c7
parent4f495b1f235540017027fa1b1ba38adecb11f00b
parent70618607ef700161b5ad688338424e79334ef3ff
Merge branch 'master' into next

Conflicts:
make.sh
make.sh