and Dmitry Torokhov, some fixes by Vojtech Pavlik.
Signed-off-by: Vojtech Pavlik <vojtech@suse.cz>
Patch-by: Peter Osterlund <petero2@telia.com>