Merge commit 'origin/master' into maemo-test

diff --cc Makefile.target
Simple merge

diff --cc cocoa.m
index f5a968a,55ff2b4..c5764e9
--- 1/cocoa.m
--- 2/cocoa.m
+++ b/cocoa.m
@@@ -938,10 -922,10 +924,10 @@@ static void cocoa_update(DisplayState *
              w * [cocoaView cdx],
              h * [cocoaView cdy]);
      }
 -    [cocoaView displayRect:rect];
 +    [cocoaView setNeedsDisplayInRect:rect];
  }
  
- static void cocoa_resize(DisplayState *ds, int w, int h)
+ static void cocoa_resize(DisplayState *ds)
  {
      COCOA_DEBUG("qemu_cocoa: cocoa_resize\n");
  

diff --cc configure
Simple merge

diff --cc hw/boards.h
Simple merge

diff --cc linux-user/main.c
index 9e46005,6e2984c..724387a
--- 1/linux-user/main.c
--- 2/linux-user/main.c
+++ b/linux-user/main.c
@@@ -2348,12 -2335,10 +2348,12 @@@ int main(int argc, char **argv, char **
  #if defined(cpu_list)
                      cpu_list(stdout, &fprintf);
  #endif
-                 _exit(1);
+                 exit(1);
              }
          } else if (!strcmp(r, "drop-ld-preload")) {
 -            (void) envlist_unsetenv(envlist, "LD_PRELOAD");
 +            drop_ld_preload = 1;
 +        } else if (!strcmp(r, "keep-ld-preload")) {
 +            drop_ld_preload = 0;
          } else if (!strcmp(r, "strace")) {
              do_strace = 1;
          } else