merge trunk

diff --cc lisp/ChangeLog
index 868667e410306b15a0eccc81b3208a481cf21aca,3537a8dd0ff0478828fc271b8d2485d29764fa7f..83d93e9b5ef93eb6640bcbc138a8b1043067aa5c
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,8 +1,16 @@@
 +2010-08-25  Kenichi Handa  <handa@m17n.org>
 +
 +      * language/misc-lang.el ("Arabic"): New language environment.
 +      Setup composition-function-table for Arabic characters.
 +
 +      * international/fontset.el (setup-default-fontset): Fix typo for
 +      arabic OTF spec (fini->fina).
 +
+ 2010-08-25  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * menu-bar.el (menu-bar-set-tool-bar-position): Set frame parameter
+       on all frames.
+ 
  2010-08-24  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
  
        * whitespace.el: Allow cleaning up blanks without blank