emmar
committed
on 16 Dec 06
Resolving conflicts on photo-album after merging