Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Jun 2010 19:57:47 +0000 (21:57 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 29 Jun 2010 19:57:47 +0000 (21:57 +0200)

Trivial merge