Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 6 Jun 2013 08:58:22 +0000 (10:58 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 6 Jun 2013 08:58:22 +0000 (10:58 +0200)

Trivial merge