diff ChangeLog @ 17063:1ae4c1a45750

merge of '3ac5981b26be545a8c546e09b6689c2359fad1bb' and 'fb7cfe3a2656a5b9be388e3bba6923561a454ca7'
author Evan Schoenberg <evan.s@dreskin.net>
date Sat, 12 May 2007 20:34:56 +0000
parents 34f698ffe88b
children e5bed026ccd2
line wrap: on
line diff