Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 1 Jun 2010 21:55:33 +0000 (23:55 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 1 Jun 2010 21:55:33 +0000 (23:55 +0200)

Trivial merge