From: Dirk Koopman <djk@tobit.co.uk>
Date: Wed, 3 Mar 2010 14:50:44 +0000 (+0000)
Subject: Merge commit '64461bf14f8ce1a'
X-Git-Tag: 1.56~39
X-Git-Url: http://dxcluster.net/gitweb/gitweb.cgi?a=commitdiff_plain;h=cf3be2ab23c544fdb17d40cbff47f8a6631e9fdb;hp=cf3be2ab23c544fdb17d40cbff47f8a6631e9fdb;p=spider.git

Merge commit '64461bf14f8ce1a'

merge in 500khz changes

Conflicts:

	Changes
	perl/Version.pm
---