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

Trivial merge