This commit was manufactured by cvs2svn to create tag 'marcus-after-thread-cbs'.