[trunk revision 232729]
