merge trunk to bgklink

git-svn-id: https://svn.code.sf.net/p/vbam/code@1230 a31d4220-a93d-0410-bf67-fe4944624d44