Code

Merge branch 'master' into ls/sensors
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:16:07 +0000 (13:16 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 5 Nov 2006 12:16:07 +0000 (13:16 +0100)

Trivial merge