Code

Merge branch 'svn-trunk'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 09:25:52 +0000 (11:25 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 25 Jun 2006 09:25:52 +0000 (11:25 +0200)

Trivial merge