apply patch for ticket #654 with a few updates to satisfy BSD-Style Bracing
apply patch for ticket #654 with a few updates to satisfy BSD-Style Bracing

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

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