Merge remote-tracking branch 'amarx/10352' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Apr 2013 11:14:46 +0000 (13:14 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 29 Apr 2013 11:14:46 +0000 (13:14 +0200)

Trivial merge