[trunk revision 241620]
