Merge branch 'events'
authorGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>
Tue, 16 Nov 2010 19:41:31 +0000 (21:41 +0200)
committerGeorge Kiagiadakis <george.kiagiadakis@collabora.co.uk>
Tue, 16 Nov 2010 19:41:49 +0000 (21:41 +0200)
commit500ce020cfe4b3d796f39600391ebbc115a88247
treeba560a77ccbbf8a586967792503c64706408a4fd
parentdbac84e63e8a6c4ce2a25b824e5b6d837045ff3a
parent82dfb39cae261cbcf6a247c6a6403e3d11f6acc9
Merge branch 'events'

Reviewed-by: George Kiagiadakis <george.kiagiadakis@collabora.co.uk>
Reviewed-by: Mauricio Piacentini <mauricio.piacentini@collabora.co.uk>