Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Dec 2008 13:19:52 +0000 (14:19 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 14 Dec 2008 13:19:52 +0000 (14:19 +0100)

Trivial merge