xserver: Branch 'master'

[Aaron Plattner]

 fb/fbcompose.c |    3 +++
 1 files changed, 3 insertions(+)

New commits:
diff-tree ca784df84e07227a4cc0a1add079884f557b7a00 (from 55bd8668e7d4100579bcd6c16a804d9f25267070)
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Sun Apr 22 16:26:01 2007 -0700

    Fix unbalanced fbGetDrawable added in commit 0a9239ec.

diff --git a/fb/fbcompose.c b/fb/fbcompose.c
index 8b5700b..0faf783 100644
--- a/fb/fbcompose.c
+++ b/fb/fbcompose.c
@@ -4146,6 +4146,9 @@ fbCompositeRect (const FbComposeData *da
 	    }
 	}
     }
+
+    if (!store)
+	fbFinishAccess (data->dest->pDrawable);
 }
 
 void