[trunk revision 169283]
