hardware, something goes wrong. So I'm reverting it for now. Please test it more carefully. svn path=/trunk/; revision=27195