	* merge from yasuyuki_handle_errors branch rev 3403 to 3415.
	* merge from yasuyuki_handle_errors branch rev 3403 to 3415.


git-svn-id: f1e1f12abfe93247072ab43c8ffb9a52242eb845@3419 4e392e78-dc3f-dc11-8fd5-00188bfc9ac4

insanity/kahua