[trunk revision 269152]
