[trunk revision 269597]
