Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 25 Jun 2010 20:55:30 +0000 (22:55 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 25 Jun 2010 20:55:30 +0000 (22:55 +0200)

Trivial merge