Merge branch 'master' of ssh://arne_f@ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Aug 2010 17:08:29 +0000 (19:08 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 1 Aug 2010 17:08:29 +0000 (19:08 +0200)

Trivial merge