[trunk revision 232481]
