[PULL] fixes and clean ups for alpha

[Keith Packard]

Excerpts from Matt Turner's message of Tue Oct 13 18:48:10 -0700 2009:

> Actually before I sent the pull request I did `git pull origin master`
> to verify that there were no conflicts, and when there weren't I did a
> `git reset --hard HEAD^`.

Ok, cool.

> Is this OK? I'm not quite sure that a better way to do it is.

There are a couple of options, but I'm not sure whether either is
better. The first is to merge from origin/master, and the second is to
rebase atop origin/master. Any one have strong feelings as to which of
these three methods is 'best'?

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 190 bytes
Desc: not available
Url : http://lists.x.org/archives/xorg-devel/attachments/20091013/6e172c0e/attachment.pgp