Merge remote-tracking branch 'whot/touch-grab-race-condition-56578-v3'
authorKeith Packard <keithp@keithp.com>
Fri, 24 May 2013 01:58:36 +0000 (19:58 -0600)
committerKeith Packard <keithp@keithp.com>
Fri, 24 May 2013 01:58:36 +0000 (19:58 -0600)

Trivial merge