Merge "Fix KVM/QEMU plugin bug" into stable/brahmaputra
authorJonas Bjurel <jonas.bjurel@ericsson.com>
Thu, 31 Mar 2016 13:58:49 +0000 (13:58 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 31 Mar 2016 13:58:49 +0000 (13:58 +0000)

Trivial merge