Merge branch 'ff/mysql'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 1 Nov 2006 10:34:16 +0000 (11:34 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 1 Nov 2006 10:34:16 +0000 (11:34 +0100)

Trivial merge