Merge branch 'tube-bus-name'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Apr 2009 15:06:05 +0000 (16:06 +0100)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Tue, 21 Apr 2009 15:06:05 +0000 (16:06 +0100)

Trivial merge