[trunk revision 239820]
