[trunk revision 240343]
