[trunk revision 233588]
