Merged revisions 659-675 via svnmerge from
authorJoel Rosdahl <joel@rosdahl.net>
Sat, 12 Feb 2005 18:32:22 +0000 (18:32 +0000)
committerJoel Rosdahl <joel@rosdahl.net>
Sat, 12 Feb 2005 18:32:22 +0000 (18:32 +0000)
/kofoto/trunk


Trivial merge