Merge branch 'master' of verplant.org:/var/lib/git/collection4
authorFlorian Forster <ff@octo.it>
Wed, 23 Jun 2010 08:33:44 +0000 (10:33 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jun 2010 08:33:44 +0000 (10:33 +0200)

Trivial merge