bug 12346 - fixed stuff r=eli