This commit was manufactured by cvs2svn to create tag 'stable_after_merge'. svn path=/tags/stable_after_merge/; revision=239