Code

Merge branch 'master-merge' into processes
authorFlorian Forster <octo@verplant.org>
Sat, 17 Jun 2006 18:14:15 +0000 (20:14 +0200)
committerFlorian Forster <octo@verplant.org>
Sat, 17 Jun 2006 18:14:15 +0000 (20:14 +0200)

Trivial merge