[PULL] touch crasher fix, two unrelated

[Keith Packard]

Peter Hutterer <peter.hutterer at who-t.net> writes:

> Jon TURNEY (1):
>       os: Remove any old logfile before trying to write to it
>
> Julien Cristau (1):
>       xkb: don't call atoi(NULL) when parsing argv
>
> Peter Hutterer (1):
>       dix: when ungrabbing an active grab, accept pointer grabs (#66720)

Merged.

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 827 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20130710/ed4db8da/attachment.pgp>