[trunk revision 247636]
