K 10
svn:author
V 4
bapt
K 8
svn:date
V 27
2012-05-17T22:07:18.000000Z
K 7
svn:log
V 93
Fix conflict handling when pkgng is used.

Submitted by:	Garrett Cooper <yanegomi@gmail.com>

END