Merge branch 'install-config'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 9 Jul 2006 09:43:04 +0000 (11:43 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 9 Jul 2006 09:43:04 +0000 (11:43 +0200)

Trivial merge