[trunk revision 242408]
