[trunk revision 242874]
