[trunk revision 228818]
