Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 25 Aug 2008 19:06:09 +0000 (19:06 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 25 Aug 2008 19:06:09 +0000 (19:06 +0000)

Trivial merge