Signed-off-by: Chenxiong Qi cqi@redhat.com
rebased onto aa21144462699fdb9f1005a3652e1680cce25ee6
Rebased only.
Pull-Request has been merged by cqi
Signed-off-by: Chenxiong Qi cqi@redhat.com