[trunk revision 183121]
