Synchronized code with NetBSD HEAD.
Bump version to 0.6.4.