[Editor's note: This is an updated version that corrects the output of Southern California Edison's new solar power installation.]

It's been a busy few weeks for California's solar industry. Earlier today, Southern California Edison announced the completion of the largest solar installation in the state -- two square miles of panels.

This follows on the heels of last week's announcement by Los Angeles Mayor Antonio Villaraigosa of a goal of 10 percent solar power by 2020 for the city.

The Prologis distribution roof in Fontana is 600,000 square feet and uses 33,700 thin film solar panels

The panels will provide 9 MW of peak capacity -- enough power for 1,300 homes, or the equivalent of a solar power plant. 

According to Southern California Edison, this rooftop installation is the first of approximately 150. The second installation will happen at a 458,000 square foot building in Chino. 

Today's announcement is part of Governor Arnold Schwarzenegger's Million Dollar Roofs plan, which will provide 3,000 MW of clean energy and reduce greenhouse gas outputs by 3 million tons.