[trunk revision 261171]
