Merge remote-tracking branch 'amarx/BUG10756' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Mar 2015 20:13:46 +0000 (21:13 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 3 Mar 2015 20:13:46 +0000 (21:13 +0100)

Trivial merge