* Merged revision 5291 from trunk