Merging default @ 860:d7e0520c9f89: hg merge -r default
Merging default @ 860:d7e0520c9f89: hg merge -r default

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