Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Jul 2010 16:24:52 +0000 (18:24 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Tue, 13 Jul 2010 16:24:52 +0000 (18:24 +0200)

Trivial merge