Merge branch 'master' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x
authorroot <root@Averatec.(none)>
Mon, 5 Jan 2009 18:30:39 +0000 (19:30 +0100)
committerroot <root@Averatec.(none)>
Mon, 5 Jan 2009 18:30:39 +0000 (19:30 +0100)

Trivial merge