Merge branch 'tp-tube'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 27 Apr 2009 10:16:38 +0000 (11:16 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Mon, 27 Apr 2009 10:16:38 +0000 (11:16 +0100)

Trivial merge