[trunk revision 227171]
