[trunk revision 231553]
