[trunk revision 233690]
