Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 Jun 2013 14:49:30 +0000 (16:49 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 18 Jun 2013 14:49:30 +0000 (16:49 +0200)

Trivial merge