Merge branch 'master' of git://comedi.org/git/comedi/comedilib
authorIan Abbott <abbotti@mev.co.uk>
Thu, 3 May 2012 12:06:46 +0000 (13:06 +0100)
committerIan Abbott <abbotti@mev.co.uk>
Thu, 3 May 2012 12:06:46 +0000 (13:06 +0100)

Trivial merge