Merge commit '64461bf14f8ce1a'
authorDirk Koopman <djk@tobit.co.uk>
Wed, 3 Mar 2010 14:50:44 +0000 (14:50 +0000)
committerDirk Koopman <djk@tobit.co.uk>
Wed, 3 Mar 2010 14:50:44 +0000 (14:50 +0000)
commitcf3be2ab23c544fdb17d40cbff47f8a6631e9fdb
tree0f8fc2eca7aecd89230b6d9b33e8c635d61107b9
parentca46fb0822f3998466ffbe4c669271ee2af86859
parent64461bf14f8ce1a01d420a01f1cf056f13b7385b
Merge commit '64461bf14f8ce1a'

merge in 500khz changes

Conflicts:

Changes
perl/Version.pm
Changes
perl/Version.pm