Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:28:46 +0000 (18:28 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Wed, 15 Jun 2011 16:28:46 +0000 (18:28 +0200)

Trivial merge