Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Mar 2009 12:11:04 +0000 (13:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 1 Mar 2009 12:11:04 +0000 (13:11 +0100)

Trivial merge