[trunk revision 167817]
