[trunk revision 237336]
