[trunk revision 267118]
