[trunk revision 234167]
