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)
commit9488760608fb66ac49951fb39741d524cf009c02
treee0e2ee642e84c54c733660a657640637cf8999b1
parentb81c0c48ad7bf68583c08e38f8a2a90c7c7dce4b
parentc2cbd1de858c0a8a994358fc717054ce32c8b895
Merge branch 'do-say-me-think'

Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>