------------------------------------------------------------------------
r7767 | kevin_fourie | 2007-11-29 12:56:51 +0200 (Thu, 29 Nov 2007) | 5 lines

Fixed merge errors that brought unneeded 3.5.x stuff in.
 
Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen

