[trunk revision 242505]
