[trunk revision 239146]
