Good old patch seems ok to me.
 Kind regards,
Sylvain Petreolle
Support artists, not multinationals - 
  De : Pierre SCHWEITZER <heis_spiter(a)hotmail.com>
 À : ReactOS Development List <ros-dev(a)reactos.org>
 Envoyé le : Vendredi, 17 Octobre 2008, 14h37mn 51s
 Objet : Re: [ros-dev] [ros-diffs] [pschweitzer] 36771: Apply fix at the right
place.......
 Shamefully, yes.
 I didn't find good programme to do it under Linux. Speaking of that, if someone
 using Linux could give me some pieces of advice about GUI svn clients under
 Linux, I would be glad :).
 TIA,
 Pierre
 ----------------------------------------
  From: aleksey(a)reactos.org
 Date: Fri, 17 Oct 2008 10:44:46 +0400
 To: ros-dev(a)reactos.org
 Subject: Re: [ros-dev] [ros-diffs] [pschweitzer] 36771: Apply fix at the     
 right
place.......
 Are you merging manually?
 On Oct 16, 2008, at 10:21 PM, pschweitzer(a)svn.reactos.org wrote:
  Author: pschweitzer
 Date: Thu Oct 16 13:21:05 2008
 New Revision: 36771
 URL: 
http://svn.reactos.org/svn/reactos?rev=36771&view=rev
 Log:
 Apply fix at the right place....... 
 _______________________________________________
 Ros-dev mailing list
 Ros-dev(a)reactos.org
 
http://www.reactos.org/mailman/listinfo/ros-dev 
 _________________________________________________________________
 Inédit ! Des Emoticônes Déjantées! Installez les dans votre Messenger !
 
http://www.ilovemessenger.fr/Emoticones/EmoticonesDejantees.aspx
 _______________________________________________
 Ros-dev mailing list
 Ros-dev(a)reactos.org
 
http://www.reactos.org/mailman/listinfo/ros-dev