Signed-off-by: Pedro Moura pmoura@redhat.com
rebased onto c3bdce539a42b556ebaf1f57e333ae34eb6d5f05
Pull-Request has been merged by zlopez
Signed-off-by: Pedro Moura pmoura@redhat.com