Skip to content
Do not merge ChangeLog and ChangeLog.old

svn path=/trunk/; revision=486