K 10 svn:author V 2 bz K 8 svn:date V 27 2010-12-15T16:21:59.811937Z K 7 svn:log V 150 Record merge-info for r216171 previously merged as r216366. Record merge-info for r216172,216176 previously merged as r216440. Approved by: re (kib) END