[trunk revision 228692]
