Date: Sunday November 10, 2002 @ 20:32 Author: warlord Update of /home/cvs/cvsroot/gnucash In directory www.linas.org:/tmp/cvs-serv29298 Modified Files: ChangeLog Log Message: Fix a merge failure