[trunk revision 241340]
