[fxbox/thinkerbell] Merge pull request #63 from ferjm/userid
[fxbox/thinkerbell] Merge pull request #63 from ferjm/userid

Apply upstream changes...again. r=Yoric
fabricedesre/foxbox,npark-mozilla/foxbox,aosmond/foxbox,npark-mozilla/foxbox,aosmond/foxbox,fabricedesre/foxbox,aosmond/foxbox,fxbox/foxbox,cr/foxbox,fabricedesre/foxbox,hkoka/foxbox,hkoka/foxbox,Yoric/foxbox,hkoka/foxbox,hkoka/foxbox,cr/foxbox,fabricedesre/foxbox,Yoric/foxbox,cr/foxbox,fxbox/foxbox,npark-mozilla/foxbox,fxbox/foxbox,Yoric/foxbox,Yoric/foxbox,cr/foxbox,npark-mozilla/foxbox,fxbox/foxbox