[trunk revision 221517]
