[trunk revision 257621]
