[trunk revision 241885]
