Signed-off-by: Andrei Stepanov astepano@redhat.com
rebased onto d96696918c5ccc4dda3e1f2b99cff28f9b8f0144
rebased onto 2d1c1c163ca66eb1c3634edc157a9ac183537c8a
Commit 75f0ae3b fixes this pull-request
Pull-Request has been merged by astepano
Signed-off-by: Andrei Stepanov astepano@redhat.com