[trunk revision 238117]
