[trunk revision 242629]
