Merge commit 'svn/origin' into ctctorigin/ctct_signed
commit1f3535e59986f69c1f7d89838f998108c1a877fd
authorChristian Thaeter <ct@pipapo.org>
Thu, 3 May 2007 23:55:55 +0000 (4 01:55 +0200)
committerChristian Thaeter <ct@pipapo.org>
Thu, 3 May 2007 23:55:55 +0000 (4 01:55 +0200)
tree7487d41dab5b11607f43c51496ce2c6b2f25a1cc
parent8f5b077d08a91890608ec124a14e651c0b9e79e2
parentefd37bb2dfe5d3c717d5c11b82824af0181a3535
Merge commit 'svn/origin' into ct