xserver: Branch 'master'

[Adam Jackson]

 randr/rrsdispatch.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2d2af76b43d62c9be07fd736652f904632fd663
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Jun 15 10:10:26 2009 -0400

    randr: fix typo in swapped dispatch

diff --git a/randr/rrsdispatch.c b/randr/rrsdispatch.c
index 9fbf8f0..f6821c3 100644
--- a/randr/rrsdispatch.c
+++ b/randr/rrsdispatch.c
@@ -453,7 +453,7 @@ static int
 SProcRRGetOutputPrimary (ClientPtr client)
 {
     int n;
-    REQUEST(xRRSetOutputPrimaryReq);
+    REQUEST(xRRGetOutputPrimaryReq);
 
     REQUEST_SIZE_MATCH(xRRGetOutputPrimaryReq);
     swaps(&stuff->length, n);