Code

Merge branch 'master' into ff/modbus
authorFlorian Forster <octo@noris.net>
Wed, 24 Mar 2010 09:08:51 +0000 (10:08 +0100)
committerFlorian Forster <octo@noris.net>
Wed, 24 Mar 2010 09:08:51 +0000 (10:08 +0100)

Trivial merge