fixed a incomplete namespace 'log' warning on FreeBSD (where 'log'
is interpreted as function 'log' instead of namespace 'log'). The
only way I know how to work around this one is to either always
use the full namespace or rename 'log' to something different.
fixed makefile for tests on Windows
Merge branch 'master' into DBPreparedStmts