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.......