[trunk revision 253118]
