[trunk revision 236009]
