Merge branch 'master' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Feb 2010 21:05:34 +0000 (22:05 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 20 Feb 2010 21:05:34 +0000 (22:05 +0100)

Trivial merge