Re: Moving OLPC merge to mainline forwards