Merge branch 'master' of ssh://linuxtv.org/git/v4l-utils
authorHans Verkuil <hverkuil@xs4all.nl>
Wed, 12 Jan 2011 07:34:21 +0000 (08:34 +0100)
committerHans Verkuil <hverkuil@xs4all.nl>
Wed, 12 Jan 2011 07:34:21 +0000 (08:34 +0100)

Trivial merge