rem: void mergePicture   ( KABC::Addressee& entry, const KABC::Addressee& other) { entry.setPhoto( other.photo() ); }
add: static void mergePicture   ( KABC::Addressee& entry, const KABC::Addressee& other) { entry.setPhoto( other.photo() ); }
context:     void mergePicture   ( KABC::Addressee& entry, const KABC::Addressee& other) {        entry.setPhoto( other.photo() );    }