Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Sep 2011 20:57:09 +0000 (22:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 5 Sep 2011 20:57:09 +0000 (22:57 +0200)

Trivial merge