merging 1.2 and main. Diffs are due to new features.
[koha_gimpoz] / tkperl /
drwxr-xr-x   ..
-rwxr-xr-x 37920 tkcirc