Merge remote-tracking branch 'amarx/BUG10753' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Feb 2015 10:11:04 +0000 (11:11 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Thu, 26 Feb 2015 10:11:04 +0000 (11:11 +0100)

Trivial merge