Merged with the changes in the HEAD branch
Authored by: gautamj 2003-09-26
Parent: [r494]
Child: [r496]