Merge r1534 from branches/ganeti/ganeti-1.2