This fixes one issue in my previous patch and one issue discovered while testing the fix.
This fixes one issue in my previous patch and one issue discovered while testing the fix.

Review URL: http://codereview.appspot.com/4277082

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