diff --git a/pixman/ChangeLog b/pixman/ChangeLog
index d1d915f7f..c6e732840 100644
--- a/pixman/ChangeLog
+++ b/pixman/ChangeLog
@@ -31,6 +31,17 @@
  	'dest' as an argument, if pict and dest don't match for RGB, BGR,
  	swap result.
 
+2005-08-28  Owen Taylor  <otaylor@redhat.com>
+
+	Bug #4260, Reviewed by B. Biggs
+ 
+ 	* src/fbcompose.c (fbStore_a8b8g8r8, fbStore_x8b8g8r8): Use & not
+ 	&& for bitwise AND.
+ 
+ 	* src/fbpict.h (fbComposeGetSolid) src/fbpict.c src/fbmmx.c: Take
+ 	'dest' as an argument, if pict and dest don't match for RGB, BGR,
+ 	swap result.
+	
 2005-08-28  Owen Taylor  <otaylor@redhat.com>
 
 	* src/fbmmx.c (detectCPUFeatures): Use local labels rather than
diff --git a/pixman/src/fbpict.c b/pixman/src/fbpict.c
index b69e79a86..09045ebe3 100644
--- a/pixman/src/fbpict.c
+++ b/pixman/src/fbpict.c
@@ -1,5 +1,5 @@
 /*
- * $Id: fbpict.c,v 1.5.2.2 2005-09-19 02:55:54 vektor Exp $
+ * $Id: fbpict.c,v 1.6 2005-09-12 12:55:11 otaylor Exp $
  *
  * Copyright © 2000 SuSE, Inc.
  *
diff --git a/pixman/src/fbpict.h b/pixman/src/fbpict.h
index a6d2c15a8..95742ed8b 100644
--- a/pixman/src/fbpict.h
+++ b/pixman/src/fbpict.h
@@ -1,5 +1,5 @@
 /*
- * $Id: fbpict.h,v 1.1.4.1 2005-09-16 13:43:41 otaylor Exp $
+ * $Id: fbpict.h,v 1.2 2005-09-12 12:55:11 otaylor Exp $
  *
  * Copyright © 2000 Keith Packard
  *             2005 Lars Knoll & Zack Rusin, Trolltech