Merge branch 'master' of ssh://comedi.org/git/comedi/comedilib
authorBernd Porr <berndporr@f2s.com>
Wed, 2 May 2012 16:59:46 +0000 (17:59 +0100)
committerBernd Porr <berndporr@f2s.com>
Wed, 2 May 2012 16:59:46 +0000 (17:59 +0100)

Trivial merge