[trunk revision 244909]
