Merge from mainline.

1 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 0bcad1118b6..c1f43f4313d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-05-03  Paul Eggert  <eggert@cs.ucla.edu>
+2011-05-04  Paul Eggert  <eggert@cs.ucla.edu>
 
         Arithmetic overflows now return float rather than wrapping around.
         (Bug#8611).
@@ -108,6 +108,11 @@
 
         * fns.c (Frandom): Let EMACS_UINT be wider than unsigned long.
 
+2011-05-03  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * xterm.c (x_set_frame_alpha): Do not set property on anything
+        else than FRAME_X_OUTER_WINDOW (Bug#8608).
+
 2011-05-02  Juanma Barranquero  <lekktu@gmail.com>
 
         * sysdep.c (get_tty_size) [WINDOWSNT]: Implement.  (Bug#8596)