Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Nov 2008 22:51:01 +0000 (23:51 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 26 Nov 2008 22:51:01 +0000 (23:51 +0100)

Trivial merge