Merge branch 'kmobs' into froyo