Signed-off-by: NArnaud Patard <apatard@mandriva.com>
Signed-off-by: NPascal Terjan <pterjan@mandriva.com>
Cc: Patrick Boettcher <patrick.boettcher@desy.de>
[mchehab@redhat.com: Fixed a small merge conflict]
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>