Merge branch 'wip/trackpoint-mb-emu-scrolling'
authorPeter Hutterer <peter.hutterer@who-t.net>
Thu, 14 Apr 2016 00:48:41 +0000 (10:48 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Thu, 14 Apr 2016 00:48:41 +0000 (10:48 +1000)

Trivial merge