Author: clkao Date: Sun Nov 11 12:53:49 2007 New Revision: 2597 Added: branches/bm-smerge-fixes/ - copied from r2580, /trunk/ Log: - Create branch bm-smerge-fixes