Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x v2.9-beta1
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Dec 2010 20:03:12 +0000 (21:03 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 11 Dec 2010 20:03:12 +0000 (21:03 +0100)

Trivial merge