Merge branch 'send-video-576394'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 23 Apr 2009 16:44:50 +0000 (17:44 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Thu, 23 Apr 2009 16:44:50 +0000 (17:44 +0100)

Trivial merge