Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 16:09:03 +0000 (18:09 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 26 Jun 2011 16:09:03 +0000 (18:09 +0200)

Trivial merge