Merge branches 'master' and 'mymerges'
[koha_fer] / localfile /
2005-06-20 tipaulsynch'ing 2.2 and head