[trunk revision 232040]
