[trunk revision 239219]
