bug 830134. r=rstrong. a=akeybl