Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Feb 2013 14:36:11 +0000 (15:36 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 14 Feb 2013 14:36:11 +0000 (15:36 +0100)

Trivial merge