Two things, 1. Continuation of changeset:499  2. Fix for ticket:351 
Two things,
1. Continuation of changeset:499 
2. Fix for ticket:351 



git-svn-id: ffc8153a6dc1bd3190771e281f3ecc84ffdca780@500 bdcdd039-d5ef-0310-875c-f7949af66bfe

xinha/xinha-svn-mirror,xinha/xinha-svn-mirror,xinha/xinha-svn-mirror,xinha/xinha-svn-mirror