rafan 4a0fd3c469 - Resolve conflicts
- Remove files that are removed in vender branch

Approved by:	delphij
2007-01-20 07:39:17 +00:00
..