Merge branch 'master' into core50
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 20:00:19 +0000 (22:00 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 7 Jul 2011 20:00:19 +0000 (22:00 +0200)

Trivial merge