K 10
svn:author
V 6
davide
K 8
svn:date
V 27
2013-03-04T18:07:28.384242Z
K 7
svn:log
V 41
Merge from head (and resolve conflicts).

END