[trunk revision 243987]
