[trunk revision 246121]
