merging from 1,2 branch. Seems OK
[koha_fer] / sampledata-1.2
2002-07-02 tonnesenCopying missing files from rel-1-2 to trunk