[trunk revision 231545]
