[trunk revision 267505]
