[trunk revision 167220]
