syncing with my current work, updating to 1.2, see changelog
reorganized SVN tree into branches, tags and trunk
