Merge remote-tracking branch 'burton/aggregator'
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 10 Aug 2012 15:23:52 +0000 (17:23 +0200)
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Fri, 10 Aug 2012 15:23:52 +0000 (17:23 +0200)

Trivial merge