[PULL] input abi 12

[Keith Packard]

On Thu, 11 Nov 2010 13:16:01 +1000, Peter Hutterer <peter.hutterer at who-t.net> wrote:

> Master pulled in, a few minor conflicts, no biggies. Please try to pull
> again.

Thanks for fixing it up. I've merged it:
   4ed4915..88cb61e  master -> master

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