[trunk revision 258670]
