Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorroot <root@ikarus.homeip.net>
Mon, 1 Dec 2008 22:24:51 +0000 (23:24 +0100)
committerroot <root@ikarus.homeip.net>
Mon, 1 Dec 2008 22:24:51 +0000 (23:24 +0100)

Trivial merge