merging from 1,2 branch. Seems OK
[koha_fer] / tkperl /
drwxr-xr-x   ..
-rwxr-xr-x 37920 tkcirc