ml-12.0
64b7f9d5 · Automatic merge of trunk into multilib ·