Merge r1295 from branches/ganeti/ganeti-1.2