Signed-off-by: Giovanni Giacobbi <giovanni@giacobbi.net> [fix conflict, reword commit title] Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Signed-off-by: Giovanni Giacobbi <giovanni@giacobbi.net> [fix conflict, reword commit title] Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>