K 10
svn:author
V 6
dinoex
K 8
svn:date
V 27
2009-08-12T07:11:30.000000Z
K 7
svn:log
V 78
- add more conflicts
Reported By:	doug, Jason J. Hellenthal

- cleanup ifdefs

END