fix merge problem
authormarkm68k <markm68k@users.sourceforge.net>
Fri, 22 Feb 2008 05:50:37 +0000 (05:50 +0000)
committermarkm68k <markm68k@users.sourceforge.net>
Fri, 22 Feb 2008 05:50:37 +0000 (05:50 +0000)
commit3ddf000dd17e099b5c2242092d49fd733344d092
tree8ab63351f175e9d235475b48247cfefe25a3a1b5
parent117316ec8bfeeed624c1ca2fbb21e4fc886c0ea7
fix merge problem
doc/source/user-manual.sgml