Fixed log4cxx version of logging
Bumped version to v2.6.1
Prepend source- and build-tree include directories.
Update libthorax
Another libthorax update