[trunk revision 240696]
