[trunk revision 262917]
