Merged the gkofoto-refactoring branch back into the trunk
authorUlrik Svensson <ulrik@kristnet.org>
Sun, 25 Apr 2004 11:21:09 +0000 (11:21 +0000)
committerUlrik Svensson <ulrik@kristnet.org>
Sun, 25 Apr 2004 11:21:09 +0000 (11:21 +0000)

Trivial merge