diff ChangeLog @ 26726:79584167519a

merge of '2f41200aa97263f1f83de2795ab3195d52475b03' and 'c0ad3732e2de434e21818fa9169f9b6835945f74'
author Ka-Hing Cheung <khc@hxbc.us>
date Tue, 28 Apr 2009 19:14:04 +0000
parents 74c6f4df901c
children 4b8eb280d946
line wrap: on
line diff