Merge remote-tracking branch 'shadeslayer/dribble_mode'
authorYouness Alaoui <youness.alaoui@collabora.co.uk>
Mon, 16 Jul 2012 19:44:42 +0000 (15:44 -0400)
committerYouness Alaoui <youness.alaoui@collabora.co.uk>
Mon, 16 Jul 2012 19:44:42 +0000 (15:44 -0400)

Trivial merge