damn automatic merge...stupid thing

Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>