i had to merge it by hand, because it was pretty outdated.

* src/input/input_ext-plugins.c: added an msleep() call in case we fail to
   allocate a new buffer in input_FillBuffer(). This is necessary because
   the input thread has an high priority and we don't want it to loop
   without any interruption.

telling that this isn't really useful yet.

  to improve responsiveness under OS X

* modules/video_output/directx: added support for the mouse gestures interface.

* modules/audio_filter/resampler/bandlimited.c: small bug-fixes.
* NEWS: added a note for the fixed MSVC project files.

  - added item on fix of 'clicking' sound between stream changes.
  - added item on new bandlimited resampler
* ALL:
  - bumped up revision number to 0.5.2-test3

* include/vlc_common.h: on win32 we include malloc.h (otherwise alloca is
   not declared).
* modules/access/file.c: use _lseeki64 instead of lseek on win32. This
   should allow seeking on files > 1.2Gb (Hopefully closes #168).

* modules/audio_filter/resampler/bandlimited.c: fix bug that was affecting
   quality badly + some clean-up.
   Changed the module priority so it is now the default resampler.

 - the german translation requires two different translations of the word
   File. I added a _ANS() function to the macosx version that gets the
   translation of 1:File and strips the first two characters of this
   alternate translation.
 - updated all .po files to make sure we don't break anything
 - committed the March 1 version of the german translation by Felix
   Kuhne <FK@aenneburghardt.de>

* Moved input_ExtractPES to where it belongs, input_ext-dec.c.

* modules/audio_filter/resampler/bandlimited.[ch]: new high-quality
   bandlimited interpolation resampler.
   It is not yet enabled by default because it requires a bit more works
   (not fully stable yet because of buffer overflows under certain conditions).

* src/audio_output/input.c: the resamplers are now always active (expcept
   in spdif mode).

* modules/audio_filter/resampler/*: modified the resampler to return the
   input buffer when no resampling is needed.

  as a plug-in,
* Another desperate attempt at fixing OS X lock-ups.

  - added remarks on m-audio fixes and other OSX specific fixes.
  - added improved ID3 detection item
* README.MacOSX.rtf
  - updated to reflect M-Audio fixes.
* ./extras/MacOSX/Resources/English.lproj/MainMenu.nib/*:
  - widened the Browse.. button to allow for the german word: durchsuchen.

* ALL: another bunch of fixes for the MSVC build.

* ALL: Finally fixed the MSVC project files.
       Don't include io.h on win32 when not necessary.
       A few build fixes for MSVC.

* src/misc/win32_specific.c: try to load winsock2 instead of winsock1 when
   present.

* Changed an error into a warning.

header send over multiples packets).

* configure.ac.in: fixed libid3tag detection.

* NEWS: started filling in the NEWS file for the 0.5.2 release.

* configure.ac.in: Removed unused options.
   We also don't link with lrt anymore when using GNU-pth (lrt depends on
   lpthread).

* src/misc/threads.c, include/vlc_threads_funcs.h: another bunch of fixes
   for the GNU-pth implementation.

* src/misc/threads.c, include/vlc_threads_funcs.h: fixed gnu-pth thread
   implementation and fixed an initialization bug in libvlc.

 - misc.cpp: toolbar buttons are translated too
 - mainframe.dfm: removed the "Back" and "Eject" toolbar buttons, which
   were rather useless, and added an "Eject disc" menu entry
   Also hid the caption for all the toolbar buttons
 - win32.cpp: Added a config option to display or not these captions
 - preferences.cpp: small modification to support non-advanced mode

* install-win32, Makefile.am: added the html faq to the win32 package.
* toolbox, msvc/*: few fixes to the msvc project files generation.
   (compiling plugins won't work yet because there are a few hacks that
    need to be done in order to compile dlls that use the c-runtime)

I've voluntarily disabled the translation of the toolbar buttons
strings, because it looks really awful...

* modules/demux/avi/avi.c: compilation fix.

to way (instead of a hard coded sleep ;)

* ALL: i18n updates and fixes.