Merge remote-tracking branch 'stevee/fixes'
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Jun 2014 09:57:45 +0000 (11:57 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 24 Jun 2014 09:57:45 +0000 (11:57 +0200)

Trivial merge