Merged revisions 676-681 via svnmerge from
authorJoel Rosdahl <joel@rosdahl.net>
Mon, 21 Feb 2005 21:44:47 +0000 (21:44 +0000)
committerJoel Rosdahl <joel@rosdahl.net>
Mon, 21 Feb 2005 21:44:47 +0000 (21:44 +0000)
/kofoto/trunk


Trivial merge