Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 31 Mar 2008 19:45:26 +0000 (21:45 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 31 Mar 2008 19:45:26 +0000 (21:45 +0200)

Trivial merge