[trunk revision 271016]
