[trunk revision 233789]
