[trunk revision 239524]
