Merge branch 'master' of ssh://linuxtv.org/git/v4l-utils
authorHans Verkuil <hverkuil@xs4all.nl>
Fri, 21 Jan 2011 16:17:00 +0000 (17:17 +0100)
committerHans Verkuil <hverkuil@xs4all.nl>
Fri, 21 Jan 2011 16:17:00 +0000 (17:17 +0100)

Trivial merge