Automated merge with file:///home/andi/devel/rietveld/master
Automated merge with file:///home/andi/devel/rietveld/master

rietveld-codereview/rietveld,openlabs/cr.openlabs.co.in,rietveld-codereview/rietveld,kscharding/integral-solutions-smxq,openlabs/cr.openlabs.co.in,v3ss0n/rietveld,fuzan/rietveld,arg0/rietveld,arg0/rietveld,andyzsf/rietveld,xtypebee/rietveld,gavioto/rietveld,andyzsf/rietveld,gavioto/rietveld,aungzanbaw/rietveld,aungzanbaw/rietveld,robfig/rietveld,v3ss0n/rietveld,kscharding/integral-solutions-smxq,rietveld-codereview/rietveld,salomon1184/rietveld,google-code-export/rietveld,v3ss0n/rietveld,gavioto/rietveld,google-code-export/rietveld,fuzan/rietveld,ericmckean/rietveld,draem0507/rietveld,aungzanbaw/rietveld,sajingeo/rietveld,berkus/rietveld,salomon1184/rietveld,DeanHere/rietveld,ericmckean/rietveld,salomon1184/rietveld,andyzsf/rietveld,gco/rietveld,rietveld-codereview/rietveld,kscharding/integral-solutions-smxq,openlabs/cr.openlabs.co.in,supriyantomaftuh/rietveld,DeanHere/rietveld,Koulio/rietveld,foolonhill/rietveld,berkus/rietveld,arg0/rietveld,DeanHere/rietveld,sajingeo/rietveld,xtypebee/rietveld,foolonhill/rietveld,supriyantomaftuh/rietveld,foolonhill/rietveld,xtypebee/rietveld,draem0507/rietveld,supriyantomaftuh/rietveld,Koulio/rietveld,dushmis/rietveld,berkus/rietveld,sajingeo/rietveld,gco/rietveld,robfig/rietveld,ericmckean/rietveld,gco/rietveld,robfig/rietveld,Koulio/rietveld,google-code-export/rietveld,fuzan/rietveld,dushmis/rietveld,dushmis/rietveld,draem0507/rietveld