[trunk revision 231384]
