[trunk revision 220605]
