xserver: Branch 'master'

[Bill Crawford]

On 11/03/2008, Daniel Stone <daniel at fooishbar.org> wrote:

>  > @@ -1830,6 +1831,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool sendNotifies)
>  >                      dsection->doodads = NULL;
>  >                  }
>  >
>  > +                dsection->sz_doodads = ssection->num_doodads;
>
>  If sz_doodads is set, you should be setting num_doodads for consistency,
>  unless this is already covered by *dsection = *ssection.

We had that conversation on xorg-devel a few weeks ago :) it's
supposed to be num_doodads there, as the alloc of the memory uses
num_doodads for the element count.