merging from main
merging from main

scraperwiki/urchin-website,thetrickster/foundation-bc,jacquesdeklerk/jacquesdeklerk,lhagan/PlainReader,lhagan/PlainReader,lhagan/PlainReader,thetrickster/foundation-bc,jacquesdeklerk/jacquesdeklerk,scraperwiki/urchin-website,derekandtereza/derekandtereza.github.com,scraperwiki/urchin-website,lhagan/PlainReader,seanoshea/krissyoshea,fady/ant-build-script,thetrickster/foundation-bc,h5bp/ant-build-script,lhagan/PlainReader,derekandtereza/derekandtereza.github.com,seanoshea/krissyoshea,jacquesdeklerk/jacquesdeklerk,thetrickster/foundation-bc,firnny29-cts/helloworld1