K 10
svn:author
V 6
johans
K 8
svn:date
V 27
2012-06-15T08:27:05.000000Z
K 7
svn:log
V 106
- Add conflicts
- Use new style options
- Remove unneeded library version numbers
- No functional changes

END