[trunk revision 172225]
