Merge branch 'next' of ssh://ms@git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Mar 2010 20:46:44 +0000 (21:46 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 9 Mar 2010 20:46:44 +0000 (21:46 +0100)

Trivial merge