[trunk revision 209157]
