some random old commits before bzr conversion