[trunk revision 272283]
