Merge branch 'master' into core50
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 25 Jul 2011 19:16:00 +0000 (21:16 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 25 Jul 2011 19:16:00 +0000 (21:16 +0200)

Trivial merge