Merging distributed builds to trunk

[Marica Tan]

Hi,

I'm currently merging distributed builds to trunk and it's pretty large so
i'm requesting everyone to stop their commits for the mean time until I
finished merging them :-)


Thanks
--
Marica