[trunk revision 231594]
