Merge commit '3af3ecd319bdcf8db27e9ca14af72383b4754567' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 12 Oct 2013 19:01:13 +0000 (21:01 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 12 Oct 2013 19:01:13 +0000 (21:01 +0200)

Trivial merge