from trunk

diff --cc src/ChangeLog
index 8ad6941a80679985041adab4fb5630e05823c1ab,60c63a8ea976f74342a4c0e793ea555fc402d309..36e056b786d9f29c99c9cfba9a1e62f2a6d82cb2
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2010-02-26  Kenichi Handa  <handa@m17n.org>
 +
 +      * xdisp.c (reseat_to_string): Fix previous change.
 +
+ 2010-02-26  David Reitter  <david.reitter@gmail.com>
+ 
+       * nsfont.m (nsfont_draw): ns_antialias_text should be a
+       Lisp_Object (Bug#4736).
+ 
  2010-02-25  Kenichi Handa  <handa@m17n.org>
  
        * xdisp.c (reseat_to_string): Fix previous change (bug#5609).