K 10
svn:author
V 6
swills
K 8
svn:date
V 27
2012-10-14T14:05:53.034069Z
K 7
svn:log
V 101
- Convert to OptionsNG
- Set conflict for older version
- Trim headers while here

Feature safe:	yes

END