[trunk revision 218620]
