Signed-off-by: Andrei Stepanov astepano@redhat.com
rebased onto f3b15df9d1e14c6fe5dc1bf2e7dd7afa26060c7c
rebased onto 01c25c4e539c4c51867b5006f98311a327d60ffa
Commit a8a15602 fixes this pull-request
Pull-Request has been merged by astepano
Signed-off-by: Andrei Stepanov astepano@redhat.com