Merged revision 321 from the trunk to the branches