Merge branch 'ls/sensors'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 Dec 2006 09:38:07 +0000 (10:38 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Fri, 22 Dec 2006 09:38:07 +0000 (10:38 +0100)
commit2d17d81b7a816e968241b809ec7004d3dde6e3f6
treeabbc39ccfa8cf410ca979d5d8c5b09dcc1f4c235
parent1b27073f0046bbbe7e84c0a3c79ca3bde8c800df
parent7751db6518466b1628382df68adc93c3b222f360
Merge branch 'ls/sensors'