Merge branch 'master' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 13:03:42 +0000 (14:03 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 29 Dec 2011 13:03:42 +0000 (14:03 +0100)

Trivial merge