[trunk revision 172909]
