[trunk revision 226068]
