Merge remote-tracking branch 'trikolon/next' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Feb 2013 12:15:14 +0000 (13:15 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 17 Feb 2013 12:15:14 +0000 (13:15 +0100)

Trivial merge