merge r1538 from branches/ganeti/ganeti-1.2