K 10
svn:author
V 3
jgh
K 8
svn:date
V 27
2012-05-07T23:06:36.000000Z
K 7
svn:log
V 224
- update to 1.1
- while here, remove unnecessary conflict
- developers using this port should test in a development environment,
  as this update is a major rewrite over the 1.0 version.

PR:	ports/167602
Submitted by:	gjb@

END