[trunk revision 266404]
