K 10
svn:author
V 5
gavin
K 8
svn:date
V 27
2010-05-05T20:54:16.735508Z
K 7
svn:log
V 99
Fix merge botch.

Submitted by:	Sofian Brabez <sbrabez gmail.com>
Pointy hat:	Earned and deserved.

END