[trunk revision 269338]
