Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Mon, 7 Jun 2010 21:34:28 +0000 (23:34 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Mon, 7 Jun 2010 21:34:28 +0000 (23:34 +0200)

Trivial merge