Updating code base
------------------

This code is currently maintained using svnmerge.

Changes from the trunk should only be merged using svnmerge as this allows better change tracking.