[trunk revision 228598]
