Merge branch 'do-say-me-think'
authorWill Thompson <will.thompson@collabora.co.uk>
Fri, 28 Aug 2009 12:18:44 +0000 (13:18 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Fri, 28 Aug 2009 12:18:46 +0000 (13:18 +0100)
Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>

Trivial merge