[trunk revision 232803]
